diff options
| author | Melanie | 2012-01-28 04:05:53 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-28 04:05:53 +0000 |
| commit | abffda269f3bdedea7e5e339c120cd2b65b2a36c (patch) | |
| tree | cb2537156fb9b4d91f5ce61987475f27e2e57f03 /bin | |
| parent | Completely disable NPC being sensed as agents, the abuse potential is too great (diff) | |
| parent | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t... (diff) | |
| download | opensim-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')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 2 |
2 files changed, 2 insertions, 2 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 | ||
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index d70c8e4..4195bce 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -129,7 +129,7 @@ | |||
| 129 | ; Change this to your server | 129 | ; Change this to your server |
| 130 | ; accessible from other grids | 130 | ; accessible from other grids |
| 131 | ; | 131 | ; |
| 132 | HomeURI = "http://mygridserver.com:8002/user" | 132 | HomeURI = "http://mygridserver.com:8002" |
| 133 | Gatekeeper = "http://mygridserver.com:8002" | 133 | Gatekeeper = "http://mygridserver.com:8002" |
| 134 | ;; If you want to protect your assets from being copied by foreign visitors | 134 | ;; If you want to protect your assets from being copied by foreign visitors |
| 135 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 135 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |