Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

2 files changed, 4 insertions, 4 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fa8dc9d..5cb51b2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -312,7 +312,7 @@
     ; Uncomment below to enable llRemoteData/remote channels
     ; remoteDataPort = 20800
 
-    grid_server_url = "http://127.0.0.1:8001"
+    grid_server_url = "http://127.0.0.1:8003"
     grid_send_key = "null"
     grid_recv_key = "null"
 
@@ -322,7 +322,7 @@
 
     asset_server_url = "http://127.0.0.1:8003"
 
-    inventory_server_url = "http://127.0.0.1:8004"
+    inventory_server_url = "http://127.0.0.1:8003"
 
     ; The MessagingServer is a companion of the UserServer. It uses
     ; user_send_key and user_recv_key, too
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6607a1a..3bc9b6c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -13,13 +13,13 @@
     ;
     ; change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://myinventoryserver.com:8004"
+    InventoryServerURI = "http://myinventoryserver.com:8003"
 
 [GridService]
     ;
     ; change this to your grid-wide grid server
     ;
-    GridServerURI = "http://mygridserver.com:8001"
+    GridServerURI = "http://mygridserver.com:8003"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.