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

prioritization
Diva Canto 2009-10-05 13:14:42 -07:00
commit 3d7e1eb7e5
2 changed files with 4 additions and 4 deletions

View File

@ -312,7 +312,7 @@
; Uncomment below to enable llRemoteData/remote channels ; Uncomment below to enable llRemoteData/remote channels
; remoteDataPort = 20800 ; 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_send_key = "null"
grid_recv_key = "null" grid_recv_key = "null"
@ -322,7 +322,7 @@
asset_server_url = "http://127.0.0.1:8003" 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 ; The MessagingServer is a companion of the UserServer. It uses
; user_send_key and user_recv_key, too ; user_send_key and user_recv_key, too

View File

@ -13,13 +13,13 @@
; ;
; change this to your grid-wide inventory server ; change this to your grid-wide inventory server
; ;
InventoryServerURI = "http://myinventoryserver.com:8004" InventoryServerURI = "http://myinventoryserver.com:8003"
[GridService] [GridService]
; ;
; change this to your grid-wide grid server ; change this to your grid-wide grid server
; ;
GridServerURI = "http://mygridserver.com:8001" GridServerURI = "http://mygridserver.com:8003"
[Modules] [Modules]
;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.