aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include/GridCommon.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/config-include/GridCommon.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/config-include/GridCommon.ini.example')
-rw-r--r--bin/config-include/GridCommon.ini.example2
1 files changed, 1 insertions, 1 deletions
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.