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

8 files changed, 53 insertions, 27 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0c21c66..9cfac98 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -397,9 +397,7 @@
     ; sized packets and faster sending of data, but more delay in
     ; updating interest lists
     ;
-    ;PrimTerseUpdatesPerPacket = 25
-    ;AvatarTerseUpdatesPerPacket = 10
-    ;PrimFullUpdatesPerPacket = 100
+    ;PrimUpdatesPerCallback = 100
 
     ; TextureSendLimit determines how many packets will be put on
     ; the outgoing queue each cycle. Like the settings above, this
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index dbac73b..9adf1ac 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -24,7 +24,7 @@
 ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
 
 ; * This is common for all services, it's the network setup for the entire
-; * server instance, if none if specified above
+; * server instance, if none is specified above
 ; *
 [Network]
     port = 8003
@@ -48,7 +48,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
+    AssetLoaderArgs = "./assets/AssetSets.xml"
 
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
@@ -68,6 +68,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;; Perform distance check for the creation of a linked region
     ; Check4096 = "True"
 
+    ;; Needed to display non-default map tile images for linked regions
+    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+
+    ;; Directory for map tile images of linked regions
+    ; MapTileDirectory = "./"
+ 
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
@@ -79,11 +85,22 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * This is the configuration for the freeswitch server in grid mode
 [FreeswitchService]
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+    ;; IP of your FS server
+    ; ServerAddress = 127.0.0.1
+
+    ;; All other options are - well - optional
+    ; Realm = "127.0.0.1"
+    ; SIPProxy = "127.0.0.1:5060"
+    ; EchoServer = "127.0.0.1"
+    ; EchoPort = 50505
+    ; AttemptSTUN = "false"
+    ; DefaultTimeout = 5000
+    ; Context = "default"
+    ; UserName = "freeswitch"
+    ; Password = "password"
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. "Realm" is the table that is used for user lookup.
-; * It defaults to "useraccounts", which uses the new style.
-; * Realm = "users" will use the legacy tables as an authentication source
+; * is implemented. 
 ; *
 [AuthenticationService]
     ; for the server connector
@@ -97,7 +114,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
         
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
-; * It defaults to "users", which uses the legacy tables
+; * It defaults to "useraccounts", which uses the new style.
+; * Realm = "users" will use the legacy tables as an authentication source
 ; *
 [UserAccountService]
     ; for the server connector
@@ -150,7 +168,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     AllowRemoteSetLoginLevel = "false"
     
     ; If you run this login server behind a proxy, set this to true
-    ; HasProxy = true
+    ; HasProxy = false
     
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
     ; CHANGE THIS
@@ -159,7 +177,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     SRV_HomeURI = "http://127.0.0.1:8002"
     SRV_InventoryServerURI = "http://127.0.0.1:8002"
     SRV_AssetServerURI = "http://127.0.0.1:8002"
-        SRV_ProfileServerURI = "http://127.0.0.1:8002"
+    SRV_ProfileServerURI = "http://127.0.0.1:8002/user"
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
@@ -218,7 +236,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     AllowTeleportsToAnyRegion = true
     
     ; If you run this gatekeeper server behind a proxy, set this to true
-    ; HasProxy = true
+    ; HasProxy = false
 
 
 [UserAgentService]
@@ -229,7 +247,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     
     ; If you run this user agent server behind a proxy, set this to true
-    ; HasProxy = true
+    ; HasProxy = false
 
     ;; If you separate the UserAgentService from the LoginService, set this to
     ;; the IP address of the machine where your LoginService is
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b12e05b..7c13076 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -16,7 +16,7 @@
 ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
-; * server instance, if none if specified above
+; * server instance, if none is specified above
 ; *
 [Network]
     port = 8003
@@ -40,7 +40,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
+    AssetLoaderArgs = "./assets/AssetSets.xml"
     AllowRemoteDelete = "false"
 
 ; * This configuration loads the inventory server modules. It duplicates
@@ -84,9 +84,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; Password = "password"
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. "Realm" is the table that is used for user lookup.
-; * It defaults to "users", which uses the legacy tables as an
-; * authentication source.
+; * is implemented. 
 ; *
 [AuthenticationService]
     ; for the server connector
@@ -158,7 +156,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; MapTileURL = "";
 
     ; If you run this login server behind a proxy, set this to true
-    ; HasProxy = true
+    ; HasProxy = false
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 762b09a..761e5eb 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -42,6 +42,9 @@
     GridServerURI = "http://mygridserver.com:8003"
     ;AllowHypergridMapSearch = true
 
+    ;; Directory for map tile images of linked regions
+    ; MapTileDirectory = "./"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
@@ -84,7 +87,7 @@
     ; Change this to your profile server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/profiles"
+    ProfileServerURI = "http://mygridserver.com:8002/user"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 409b2a9..e983755 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,12 +44,15 @@
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
 
 [GridService]
-        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
-        ; which in turn uses this
+    ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+    ; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-        AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for linked regions
+    AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+
+    AllowHypergridMapSearch = true
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 58059f5..4956bc3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -65,6 +65,9 @@
     ;; With hypergrid, perform distance check for the creation of a linked region
     ; Check4096 = true
 
+    ;; Directory for map tile images of remote regions
+    ; MapTileDirectory = "./"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 68aa739..486f22e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -65,12 +65,15 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
 [GridService]
-        ; LocalGridServicesConnector needs this
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        Realm = "regions"
+    ; LocalGridServicesConnector needs this
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
         
-        AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for remote regions
+    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+  
+    AllowHypergridMapSearch = true
         
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/libode-x86_64.so b/bin/libode-x86_64.so
index 57b7e1d..9c3070a 100644
--- a/bin/libode-x86_64.so
+++ b/bin/libode-x86_64.so