* Tleiades grid mode inventory (#444) - thanx Tleiades!

  * updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
 

2 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index b65488a..cf194fc 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Framework.Types
         public int HttpListenerPort = 9000;
         public int RemotingListenerPort = 8895;
 
+        public int InventoryServerPort;
+        public string InventoryServerName = "";
 
         public NetworkServersInfo()
         {
@@ -86,7 +88,8 @@ namespace OpenSim.Framework.Types
             UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
             UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
             AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003");
-
+            InventoryServerPort = config.Configs["Network"].GetInt("inventory_server_port", 8004);
+            InventoryServerName = config.Configs["Network"].GetString("inventory_server_name", "127.0.0.1");
         }
     }
 }
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index 9e9654d..feae4ae 100644
--- a/OpenSim/Framework/General/Types/UUID.cs
+++ b/OpenSim/Framework/General/Types/UUID.cs
@@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types
 
         public void Combine(UUID other)
         {
-            llUUID.Combine(other.GetLLUUID());
+            LLUUID.Combine(llUUID, other.GetLLUUID());
         }
 
         public void Combine(LLUUID other)
         {
-            llUUID.Combine(other);
+            LLUUID.Combine(llUUID, other);
         }
 
         public override bool Equals(Object other)