diff options
| author | Melanie | 2012-06-09 16:28:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-09 16:28:22 +0100 |
| commit | 8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch) | |
| tree | b9e133efe376878064c12b83a4e6d5eef62ceb4e /bin/Robust.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff) | |
| download | opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/Robust.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 1c04ab5..f70d13b 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -166,7 +166,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 166 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 | 166 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 |
| 167 | ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. | 167 | ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. |
| 168 | ;; Default is false | 168 | ;; Default is false |
| 169 | ; CreateDefaultAvatarEntries = false | 169 | CreateDefaultAvatarEntries = true |
| 170 | 170 | ||
| 171 | ;; Allow the service to process HTTP createuser calls. | 171 | ;; Allow the service to process HTTP createuser calls. |
| 172 | ;; Default is false. | 172 | ;; Default is false. |