diff options
| author | Melanie | 2012-01-02 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-02 21:41:36 +0000 |
| commit | a6e305063e9045194cd8348f73f3b75d07f3883e (patch) | |
| tree | c3287856ea47817715da89c737e3ccfe4d4c9f5d /bin/Robust.HG.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff) | |
| download | opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.zip opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2 opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index eee7dc8..49ee41a 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -82,6 +82,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 82 | ; * | 82 | ; * |
| 83 | [GridService] | 83 | [GridService] |
| 84 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 84 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
| 85 | HypergridLinker = true | ||
| 86 | |||
| 85 | ; Realm = "regions" | 87 | ; Realm = "regions" |
| 86 | ; AllowDuplicateNames = "True" | 88 | ; AllowDuplicateNames = "True" |
| 87 | 89 | ||