diff options
| author | Melanie | 2013-07-29 02:08:05 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-29 02:08:05 +0100 |
| commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
| tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /bin/config-include/Standalone.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Same issue. (diff) | |
| download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/config-include/Standalone.ini')
| -rw-r--r-- | bin/config-include/Standalone.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index ba72fe7..d3b9cb4 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | EntityTransferModule = "BasicEntityTransferModule" | 19 | EntityTransferModule = "BasicEntityTransferModule" |
| 20 | InventoryAccessModule = "BasicInventoryAccessModule" | 20 | InventoryAccessModule = "BasicInventoryAccessModule" |
| 21 | MapImageService = "MapImageServiceModule" | 21 | MapImageService = "MapImageServiceModule" |
| 22 | SearchModule = "BasicSearchModule" | ||
| 22 | 23 | ||
| 23 | LibraryModule = true | 24 | LibraryModule = true |
| 24 | LLLoginServiceInConnector = true | 25 | LLLoginServiceInConnector = true |