aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Robust.HG.ini.example
diff options
context:
space:
mode:
authorMelanie2012-01-28 04:05:53 +0000
committerMelanie2012-01-28 04:05:53 +0000
commitabffda269f3bdedea7e5e339c120cd2b65b2a36c (patch)
treecb2537156fb9b4d91f5ce61987475f27e2e57f03 /bin/Robust.HG.ini.example
parentCompletely disable NPC being sensed as agents, the abuse potential is too great (diff)
parentAdd an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t... (diff)
downloadopensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.zip
opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.gz
opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.bz2
opensim-SC-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
-rw-r--r--bin/Robust.HG.ini.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 668fabc..ab5880d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -251,7 +251,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
251 SRV_HomeURI = "http://127.0.0.1:8002" 251 SRV_HomeURI = "http://127.0.0.1:8002"
252 SRV_InventoryServerURI = "http://127.0.0.1:8002" 252 SRV_InventoryServerURI = "http://127.0.0.1:8002"
253 SRV_AssetServerURI = "http://127.0.0.1:8002" 253 SRV_AssetServerURI = "http://127.0.0.1:8002"
254 SRV_ProfileServerURI = "http://127.0.0.1:8002/user" 254 SRV_ProfileServerURI = "http://127.0.0.1:8002"
255 SRV_FriendsServerURI = "http://127.0.0.1:8002" 255 SRV_FriendsServerURI = "http://127.0.0.1:8002"
256 SRV_IMServerURI = "http://127.0.0.1:8002" 256 SRV_IMServerURI = "http://127.0.0.1:8002"
257 257