diff options
| author | Melanie | 2011-12-05 17:10:51 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 17:10:51 +0000 |
| commit | 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch) | |
| tree | 537b010672277073530cf013434fa046aabfec7e /bin | |
| parent | Strip CR from http responses and limit them to 2048 chars (diff) | |
| parent | HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff) | |
| download | opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.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 beef1c3..90f7b5c 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -260,7 +260,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 260 | ; See http://opensimulator.org/wiki/GridInfo | 260 | ; See http://opensimulator.org/wiki/GridInfo |
| 261 | 261 | ||
| 262 | ; login uri: for grid this is the login server URI | 262 | ; login uri: for grid this is the login server URI |
| 263 | login = http://127.0.0.1:9000/ | 263 | login = http://127.0.0.1:8002/ |
| 264 | 264 | ||
| 265 | ; long grid name: the long name of your grid | 265 | ; long grid name: the long name of your grid |
| 266 | gridname = "the lost continent of hippo" | 266 | gridname = "the lost continent of hippo" |