diff options
| author | Melanie | 2012-09-07 19:49:46 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-07 19:49:46 +0100 |
| commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
| tree | 110f0e402b879f49943ff2e76598e2241e20057c /bin/config-include | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'bin/config-include')
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 75c4788..cc6c587 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -36,8 +36,6 @@ | |||
| 36 | SimulationServiceInConnector = true | 36 | SimulationServiceInConnector = true |
| 37 | MapImageServiceInConnector = true | 37 | MapImageServiceInConnector = true |
| 38 | 38 | ||
| 39 | [Profile] | ||
| 40 | Module = "BasicProfileModule" | ||
| 41 | 39 | ||
| 42 | [Messaging] | 40 | [Messaging] |
| 43 | MessageTransferModule = HGMessageTransferModule | 41 | MessageTransferModule = HGMessageTransferModule |
| @@ -97,6 +95,10 @@ | |||
| 97 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 95 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
| 98 | GridService = "OpenSim.Services.GridService.dll:GridService" | 96 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 99 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 97 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
| 98 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | ||
| 99 | |||
| 100 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud. | ||
| 101 | CreateDefaultAvatarEntries = true | ||
| 100 | 102 | ||
| 101 | [GridUserService] | 103 | [GridUserService] |
| 102 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" | 104 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" |