Skip to content

Commit b76a237

Browse files
author
Jukka Jyl�nki
committed
Specify startup configuration xml files as they are in the shipped installer. (this commit not back to main development branch).
1 parent df7d3a8 commit b76a237

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

bin/plugins.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616
<plugin path="DebugStatsModule" /> <!-- DebugStatsModule depends on OgreRenderingModule, EnvironmentModule, OgreAssetEditorModule and AssetModule -->
1717
<plugin path="BrowserUiPlugin" /> <!-- Depends on JavascriptModule -->
1818
<plugin path="SceneWidgetComponents" /> <!-- Depends on OgreRenderingModule and TundraProtocolModule (and optionally on BrowserUiPlugin) -->
19-
<plugin path="PythonScriptModule" /> <!-- Depends on OgreRenderingModule, TundraProtocolModule -->
2019
<plugin path="MumblePlugin" /> <!-- Depends on OgreRenderingModule, JavascriptModule and TundraLogicModule -->
2120
<plugin path="VlcPlugin" /> <!-- Depends on SceneWidgetComponents -->
2221
<plugin path="CAVEStereoModule" /> <!-- Depends on OgreRenderingModule -->
2322
<plugin path="CanvasPlugin" /> <!-- Depends on OgreRenderingModule -->
23+
<plugin path="SpeexVoipModule" />
24+
<plugin path="OpenDocuments" />
25+
<plugin path="StreamsModule" />
26+
<plugin path="EC_QmlApp" />
27+
<plugin path="KNetProvider" />
2428

2529
<!-- TODO: Currently the above <plugin> items are loaded in the order they are specified, but below, the jsplugin items are loaded in an undefined order. Use the order specified here as the load order. -->
2630
<!-- NOTE: The startup .js scripts are specified only by base name of the file. Don's specify a path here. Place the startup .js scripts to /bin/jsmodules/startup/. -->

bin/viewer-browser.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@
1616
<plugin path="DebugStatsModule" /> <!-- DebugStatsModule depends on OgreRenderingModule, EnvironmentModule, OgreAssetEditorModule and AssetModule -->
1717
<plugin path="BrowserUiPlugin" /> <!-- Depends on JavascriptModule -->
1818
<plugin path="SceneWidgetComponents" /> <!-- Depends on OgreRenderingModule and TundraProtocolModule (and optionally on BrowserUiPlugin) -->
19-
<plugin path="PythonScriptModule" /> <!-- Depends on OgreRenderingModule, TundraProtocolModule -->
2019
<plugin path="MumblePlugin" /> <!-- Depends on OgreRenderingModule, JavascriptModule and TundraLogicModule -->
2120
<plugin path="VlcPlugin" /> <!-- Depends on SceneWidgetComponents -->
2221
<plugin path="CAVEStereoModule" /> <!-- Depends on OgreRenderingModule -->
2322
<plugin path="CanvasPlugin" /> <!-- Depends on OgreRenderingModule -->
2423
<plugin path="AssetInterestPlugin" />
24+
<plugin path="SpeexVoipModule" />
25+
<plugin path="OpenDocuments" />
26+
<plugin path="StreamsModule" />
27+
<plugin path="EC_QmlApp" />
28+
<plugin path="KNetProvider" />
2529

2630
<!-- TODO: Currently the above <plugin> items are loaded in the order they are specified, but below, the jsplugin items are loaded in an undefined order. Use the order specified here as the load order. -->
2731
<!-- NOTE: The startup .js scripts are specified only by base name of the file. Don's specify a path here. Place the startup .js scripts to /bin/jsmodules/startup/. -->

bin/viewer.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@
1414
<plugin path="SkyXHydrax" /> <!-- SkyXHydrax depends on OgreRenderingModule -->
1515
<plugin path="OgreAssetEditorModule" /> <!-- OgreAssetEditorModule depends on OgreRenderingModule -->
1616
<plugin path="DebugStatsModule" /> <!-- DebugStatsModule depends on OgreRenderingModule, EnvironmentModule, OgreAssetEditorModule and AssetModule -->
17-
<plugin path="BrowserUiPlugin" /> <!-- Depends on JavascriptModule -->
17+
<plugin path="BrowserUiPlugin" /> <!-- Depends on JavascriptModule -->
1818
<plugin path="SceneWidgetComponents" /> <!-- Depends on OgreRenderingModule and TundraProtocolModule (and optionally on BrowserUiPlugin) -->
19-
<plugin path="PythonScriptModule" /> <!-- Depends on OgreRenderingModule, TundraProtocolModule -->
2019
<plugin path="MumblePlugin" /> <!-- Depends on OgreRenderingModule, JavascriptModule and TundraLogicModule -->
2120
<plugin path="VlcPlugin" /> <!-- Depends on SceneWidgetComponents -->
2221
<plugin path="CAVEStereoModule" /> <!-- Depends on OgreRenderingModule -->
2322
<plugin path="CanvasPlugin" /> <!-- Depends on OgreRenderingModule -->
23+
<plugin path="SpeexVoipModule" />
24+
<plugin path="OpenDocuments" />
25+
<plugin path="StreamsModule" />
26+
<plugin path="EC_QmlApp" />
27+
<plugin path="KNetProvider" />
2428

2529
<!-- TODO: Currently the above <plugin> items are loaded in the order they are specified, but below, the jsplugin items are loaded in an undefined order. Use the order specified here as the load order. -->
2630
<!-- NOTE: The startup .js scripts are specified only by base name of the file. Don's specify a path here. Place the startup .js scripts to /bin/jsmodules/startup/. -->

0 commit comments

Comments
 (0)