diff options
| author | Justin Clark-Casey (justincc) | 2012-06-05 00:15:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-05 00:15:29 +0100 |
| commit | c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b (patch) | |
| tree | c3815dda04912df1fab703f370043de807b62f73 /bin | |
| parent | Properly show per frame millisecond statistics per frame, not as amount of ti... (diff) | |
| parent | Add replaceable region modules to the "show modules" command (diff) | |
| download | opensim-SC-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.zip opensim-SC-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.gz opensim-SC-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.bz2 opensim-SC-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/Grid.ini | 3 | ||||
| -rw-r--r-- | bin/config-include/Standalone.ini | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 95d6264..cb3a5c8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
| @@ -29,9 +29,6 @@ | |||
| 29 | SimulationServiceInConnector = true | 29 | SimulationServiceInConnector = true |
| 30 | LibraryModule = true | 30 | LibraryModule = true |
| 31 | 31 | ||
| 32 | [Profile] | ||
| 33 | Module = "BasicProfileModule" | ||
| 34 | |||
| 35 | [SimulationDataStore] | 32 | [SimulationDataStore] |
| 36 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 33 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
| 37 | 34 | ||
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 74d9d2e..ba72fe7 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
| @@ -25,9 +25,6 @@ | |||
| 25 | GridInfoServiceInConnector = true | 25 | GridInfoServiceInConnector = true |
| 26 | MapImageServiceInConnector = true | 26 | MapImageServiceInConnector = true |
| 27 | 27 | ||
| 28 | [Profile] | ||
| 29 | Module = "BasicProfileModule" | ||
| 30 | |||
| 31 | [SimulationDataStore] | 28 | [SimulationDataStore] |
| 32 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 29 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
| 33 | 30 | ||