diff options
Diffstat (limited to '')
4 files changed, 25 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index a9ecde8..59e4037 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
168 | 168 | ||
169 | if (neighbour != null) | 169 | if (neighbour != null) |
170 | { | 170 | { |
171 | m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); | 171 | // m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); |
172 | m_scene.EventManager.TriggerOnRegionUp(neighbour); | 172 | m_scene.EventManager.TriggerOnRegionUp(neighbour); |
173 | } | 173 | } |
174 | else | 174 | else |
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
183 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); | 183 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); |
184 | 184 | ||
185 | List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); | 185 | List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); |
186 | m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); | 186 | //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); |
187 | foreach (GridRegion n in neighbours) | 187 | foreach (GridRegion n in neighbours) |
188 | { | 188 | { |
189 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; | 189 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; |
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
267 | protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle) | 267 | protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle) |
268 | { | 268 | { |
269 | 269 | ||
270 | m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); | 270 | //m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); |
271 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. | 271 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. |
272 | 272 | ||
273 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); | 273 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a711ebf..68b645e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9145,8 +9145,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9145 | return UUID.Zero.ToString(); | 9145 | return UUID.Zero.ToString(); |
9146 | } | 9146 | } |
9147 | reply = new LSL_Vector( | 9147 | reply = new LSL_Vector( |
9148 | info.RegionLocX / Constants.RegionSize, | 9148 | info.RegionLocX, |
9149 | info.RegionLocY / Constants.RegionSize, | 9149 | info.RegionLocY, |
9150 | 0).ToString(); | 9150 | 0).ToString(); |
9151 | break; | 9151 | break; |
9152 | case 6: // DATA_SIM_STATUS | 9152 | case 6: // DATA_SIM_STATUS |
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 240f5b1..c1da463 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -178,6 +178,8 @@ namespace OpenSim.Services.LLLoginService | |||
178 | // Web map | 178 | // Web map |
179 | private string mapTileURL; | 179 | private string mapTileURL; |
180 | 180 | ||
181 | private string searchURL; | ||
182 | |||
181 | // Error Flags | 183 | // Error Flags |
182 | private string errorReason; | 184 | private string errorReason; |
183 | private string errorMessage; | 185 | private string errorMessage; |
@@ -226,7 +228,7 @@ namespace OpenSim.Services.LLLoginService | |||
226 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, | 228 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, |
227 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 229 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
228 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 230 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
229 | GridRegion home, IPEndPoint clientIP, string mapTileURL) | 231 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL) |
230 | : this() | 232 | : this() |
231 | { | 233 | { |
232 | FillOutInventoryData(invSkel, libService); | 234 | FillOutInventoryData(invSkel, libService); |
@@ -243,6 +245,7 @@ namespace OpenSim.Services.LLLoginService | |||
243 | BuddList = ConvertFriendListItem(friendsList); | 245 | BuddList = ConvertFriendListItem(friendsList); |
244 | StartLocation = where; | 246 | StartLocation = where; |
245 | MapTileURL = mapTileURL; | 247 | MapTileURL = mapTileURL; |
248 | SearchURL = searchURL; | ||
246 | 249 | ||
247 | FillOutHomeData(pinfo, home); | 250 | FillOutHomeData(pinfo, home); |
248 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); | 251 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); |
@@ -416,6 +419,7 @@ namespace OpenSim.Services.LLLoginService | |||
416 | InitialOutfitHash["gender"] = "female"; | 419 | InitialOutfitHash["gender"] = "female"; |
417 | initialOutfit.Add(InitialOutfitHash); | 420 | initialOutfit.Add(InitialOutfitHash); |
418 | mapTileURL = String.Empty; | 421 | mapTileURL = String.Empty; |
422 | searchURL = String.Empty; | ||
419 | } | 423 | } |
420 | 424 | ||
421 | 425 | ||
@@ -479,6 +483,9 @@ namespace OpenSim.Services.LLLoginService | |||
479 | responseData["region_x"] = (Int32)(RegionX); | 483 | responseData["region_x"] = (Int32)(RegionX); |
480 | responseData["region_y"] = (Int32)(RegionY); | 484 | responseData["region_y"] = (Int32)(RegionY); |
481 | 485 | ||
486 | if (searchURL != String.Empty) | ||
487 | responseData["search"] = searchURL; | ||
488 | |||
482 | if (mapTileURL != String.Empty) | 489 | if (mapTileURL != String.Empty) |
483 | responseData["map-server-url"] = mapTileURL; | 490 | responseData["map-server-url"] = mapTileURL; |
484 | 491 | ||
@@ -581,6 +588,9 @@ namespace OpenSim.Services.LLLoginService | |||
581 | if (mapTileURL != String.Empty) | 588 | if (mapTileURL != String.Empty) |
582 | map["map-server-url"] = OSD.FromString(mapTileURL); | 589 | map["map-server-url"] = OSD.FromString(mapTileURL); |
583 | 590 | ||
591 | if (searchURL != String.Empty) | ||
592 | map["search"] = OSD.FromString(searchURL); | ||
593 | |||
584 | if (m_buddyList != null) | 594 | if (m_buddyList != null) |
585 | { | 595 | { |
586 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); | 596 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); |
@@ -938,6 +948,12 @@ namespace OpenSim.Services.LLLoginService | |||
938 | set { mapTileURL = value; } | 948 | set { mapTileURL = value; } |
939 | } | 949 | } |
940 | 950 | ||
951 | public string SearchURL | ||
952 | { | ||
953 | get { return searchURL; } | ||
954 | set { searchURL = value; } | ||
955 | } | ||
956 | |||
941 | public string Message | 957 | public string Message |
942 | { | 958 | { |
943 | get { return welcomeMessage; } | 959 | get { return welcomeMessage; } |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9446126..f9fe7f0 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService | |||
74 | protected string m_GatekeeperURL; | 74 | protected string m_GatekeeperURL; |
75 | protected bool m_AllowRemoteSetLoginLevel; | 75 | protected bool m_AllowRemoteSetLoginLevel; |
76 | protected string m_MapTileURL; | 76 | protected string m_MapTileURL; |
77 | protected string m_SearchURL; | ||
77 | 78 | ||
78 | IConfig m_LoginServerConfig; | 79 | IConfig m_LoginServerConfig; |
79 | 80 | ||
@@ -102,6 +103,7 @@ namespace OpenSim.Services.LLLoginService | |||
102 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 103 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
103 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 104 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
104 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 105 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
106 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | ||
105 | 107 | ||
106 | // These are required; the others aren't | 108 | // These are required; the others aren't |
107 | if (accountService == string.Empty || authService == string.Empty) | 109 | if (accountService == string.Empty || authService == string.Empty) |
@@ -364,7 +366,7 @@ namespace OpenSim.Services.LLLoginService | |||
364 | // Finally, fill out the response and return it | 366 | // Finally, fill out the response and return it |
365 | // | 367 | // |
366 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 368 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
367 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL); | 369 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL); |
368 | 370 | ||
369 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 371 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
370 | return response; | 372 | return response; |