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/StandaloneHypergrid.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Same issue. (diff) | |
| download | opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC-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/StandaloneHypergrid.ini')
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 39c33e8..3abf49b 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | InventoryAccessModule = "HGInventoryAccessModule" | 25 | InventoryAccessModule = "HGInventoryAccessModule" |
| 26 | FriendsModule = "HGFriendsModule" | 26 | FriendsModule = "HGFriendsModule" |
| 27 | UserManagementModule = "HGUserManagementModule" | 27 | UserManagementModule = "HGUserManagementModule" |
| 28 | SearchModule = "BasicSearchModule" | ||
| 28 | 29 | ||
| 29 | InventoryServiceInConnector = true | 30 | InventoryServiceInConnector = true |
| 30 | AssetServiceInConnector = true | 31 | AssetServiceInConnector = true |