aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Robust.ini.example
diff options
context:
space:
mode:
authorMelanie2013-11-08 17:55:01 +0000
committerMelanie2013-11-08 17:55:01 +0000
commit91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch)
tree3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /bin/Robust.ini.example
parentMerge branch 'master' into careminster (diff)
parentIf the LSL state_entry() event definition contains any parameters, then gener... (diff)
downloadopensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip
opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz
opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2
opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'bin/Robust.ini.example')
-rw-r--r--bin/Robust.ini.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 6a84574..0660de4 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -425,7 +425,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
425 425
426 ; helper uri: optional: if it exists if will be used to tell the client to use 426 ; helper uri: optional: if it exists if will be used to tell the client to use
427 ; this for all economy related things 427 ; this for all economy related things
428 ;economy = http://127.0.0.1:9000/ 428 ;economy = http://127.0.0.1:8002/
429 429
430 ; web page of grid: optional: page providing further information about your grid 430 ; web page of grid: optional: page providing further information about your grid
431 ;about = http://127.0.0.1/about/ 431 ;about = http://127.0.0.1/about/