Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

@@ -168,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (neighbour != null)
             {
-                m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
+              //  m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
                 m_scene.EventManager.TriggerOnRegionUp(neighbour);
             }
             else
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
 
             List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
-            m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
+            //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
             foreach (GridRegion n in neighbours)
             {
                 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
         {
 
-            m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
+            //m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
             // let's do our best, but there's not much we can do if the neighbour doesn't accept.
 
             //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -9145,8 +9145,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             return UUID.Zero.ToString();
                         }
                         reply = new LSL_Vector(
-                            info.RegionLocX / Constants.RegionSize,
+                            info.RegionLocX,
-                            info.RegionLocY / Constants.RegionSize,
+                            info.RegionLocY,
                             0).ToString();
                         break;
                     case 6: // DATA_SIM_STATUS

OpenSim/Services/LLLoginService/LLLoginResponse.cs

@@ -178,6 +178,8 @@ namespace OpenSim.Services.LLLoginService
         // Web map
         private string mapTileURL;
 
+        private string searchURL;
+
         // Error Flags
         private string errorReason;
         private string errorMessage;
@@ -226,7 +228,7 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP, string mapTileURL)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -243,6 +245,7 @@ namespace OpenSim.Services.LLLoginService
             BuddList = ConvertFriendListItem(friendsList);
             StartLocation = where;
             MapTileURL = mapTileURL;
+            SearchURL = searchURL;
 
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -416,6 +419,7 @@ namespace OpenSim.Services.LLLoginService
             InitialOutfitHash["gender"] = "female";
             initialOutfit.Add(InitialOutfitHash);
             mapTileURL = String.Empty;
+            searchURL = String.Empty;
         }
 
 
@@ -479,6 +483,9 @@ namespace OpenSim.Services.LLLoginService
                 responseData["region_x"] = (Int32)(RegionX);
                 responseData["region_y"] = (Int32)(RegionY);
 
+                if (searchURL != String.Empty)
+                    responseData["search"] = searchURL;
+
                 if (mapTileURL != String.Empty)
                     responseData["map-server-url"] = mapTileURL;
 
@@ -581,6 +588,9 @@ namespace OpenSim.Services.LLLoginService
                 if (mapTileURL != String.Empty)
                     map["map-server-url"] = OSD.FromString(mapTileURL);
 
+                if (searchURL != String.Empty)
+                    map["search"] = OSD.FromString(searchURL);
+
                 if (m_buddyList != null)
                 {
                     map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -938,6 +948,12 @@ namespace OpenSim.Services.LLLoginService
             set { mapTileURL = value; }
         }
 
+        public string SearchURL
+        {
+            get { return searchURL; }
+            set { searchURL = value; }
+        }
+
         public string Message
         {
             get { return welcomeMessage; }

OpenSim/Services/LLLoginService/LLLoginService.cs

@@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService
         protected string m_GatekeeperURL;
         protected bool m_AllowRemoteSetLoginLevel;
         protected string m_MapTileURL;
+        protected string m_SearchURL;
 
         IConfig m_LoginServerConfig;
 
@@ -102,6 +103,7 @@ namespace OpenSim.Services.LLLoginService
             m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
             m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
             m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
+            m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
 
             // These are required; the others aren't
             if (accountService == string.Empty || authService == string.Empty)
@@ -364,7 +366,7 @@ namespace OpenSim.Services.LLLoginService
                 // Finally, fill out the response and return it
                 //
                 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                 return response;