diff options
author | Melanie | 2012-10-16 04:30:01 +0100 |
---|---|---|
committer | Melanie | 2012-10-16 04:30:01 +0100 |
commit | fa52effb279355ef731725c04c3b659f972f3903 (patch) | |
tree | 7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim | |
parent | Fix a merge issue (diff) | |
parent | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff) | |
download | opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.zip opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.gz opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2 opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim')
8 files changed, 57 insertions, 24 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index c705f10..f509d94 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -241,8 +241,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
241 | m_HostCapsObj.RegisterHandler( | 241 | m_HostCapsObj.RegisterHandler( |
242 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); | 242 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); |
243 | 243 | ||
244 | m_log.DebugFormat( | 244 | // m_log.DebugFormat( |
245 | "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); | 245 | // "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); |
246 | 246 | ||
247 | //m_capsHandlers["MapLayer"] = | 247 | //m_capsHandlers["MapLayer"] = |
248 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", | 248 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
@@ -337,11 +337,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
337 | public string SeedCapRequest(string request, string path, string param, | 337 | public string SeedCapRequest(string request, string path, string param, |
338 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 338 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
339 | { | 339 | { |
340 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); | 340 | m_log.DebugFormat( |
341 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | ||
341 | 342 | ||
342 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 343 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
343 | { | 344 | { |
344 | m_log.DebugFormat( | 345 | m_log.WarnFormat( |
345 | "[CAPS]: Unauthorized CAPS client {0} from {1}", | 346 | "[CAPS]: Unauthorized CAPS client {0} from {1}", |
346 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); | 347 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); |
347 | 348 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 132546b..5bbdce8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -111,10 +111,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
111 | false, | 111 | false, |
112 | "debug eq", | 112 | "debug eq", |
113 | "debug eq [0|1|2]", | 113 | "debug eq [0|1|2]", |
114 | "Turn on event queue debugging" | 114 | "Turn on event queue debugging\n" |
115 | + "<= 0 - turns off all event queue logging" | 115 | + " <= 0 - turns off all event queue logging\n" |
116 | + ">= 1 - turns on outgoing event logging" | 116 | + " >= 1 - turns on outgoing event logging\n" |
117 | + ">= 2 - turns on poll notification", | 117 | + " >= 2 - turns on poll notification", |
118 | HandleDebugEq); | 118 | HandleDebugEq); |
119 | } | 119 | } |
120 | else | 120 | else |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 413536d..bac71b0 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
@@ -109,7 +109,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
109 | 109 | ||
110 | UUID capID = UUID.Random(); | 110 | UUID capID = UUID.Random(); |
111 | 111 | ||
112 | m_log.DebugFormat("[REGION CONSOLE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 112 | // m_log.DebugFormat("[REGION CONSOLE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); |
113 | caps.RegisterHandler( | 113 | caps.RegisterHandler( |
114 | "SimConsoleAsync", | 114 | "SimConsoleAsync", |
115 | new ConsoleHandler("/CAPS/" + capID + "/", "SimConsoleAsync", agentID, this, m_scene)); | 115 | new ConsoleHandler("/CAPS/" + capID + "/", "SimConsoleAsync", agentID, this, m_scene)); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index d04bd96..7686b94 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -9251,7 +9251,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9251 | } | 9251 | } |
9252 | #endregion | 9252 | #endregion |
9253 | 9253 | ||
9254 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) | 9254 | string method = Utils.BytesToString(messagePacket.MethodData.Method); |
9255 | |||
9256 | switch (method) | ||
9255 | { | 9257 | { |
9256 | case "getinfo": | 9258 | case "getinfo": |
9257 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) | 9259 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
@@ -9567,7 +9569,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9567 | return true; | 9569 | return true; |
9568 | 9570 | ||
9569 | default: | 9571 | default: |
9570 | m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket); | 9572 | m_log.WarnFormat( |
9573 | "[LLCLIENTVIEW]: EstateOwnerMessage: Unknown method {0} requested for {1} in {2}", | ||
9574 | method, Name, Scene.Name); | ||
9575 | |||
9576 | for (int i = 0; i < messagePacket.ParamList.Length; i++) | ||
9577 | { | ||
9578 | EstateOwnerMessagePacket.ParamListBlock block = messagePacket.ParamList[i]; | ||
9579 | string data = (string)Utils.BytesToString(block.Parameter); | ||
9580 | m_log.DebugFormat("[LLCLIENTVIEW]: Param {0}={1}", i, data); | ||
9581 | } | ||
9582 | |||
9571 | return true; | 9583 | return true; |
9572 | } | 9584 | } |
9573 | 9585 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index e355ebf..ffc362f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -488,10 +488,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
488 | // both regions | 488 | // both regions |
489 | if (sp.ParentID != (uint)0) | 489 | if (sp.ParentID != (uint)0) |
490 | sp.StandUp(); | 490 | sp.StandUp(); |
491 | |||
492 | else if (sp.Flying) | 491 | else if (sp.Flying) |
493 | teleportFlags |= (uint)TeleportFlags.IsFlying; | 492 | teleportFlags |= (uint)TeleportFlags.IsFlying; |
494 | 493 | ||
494 | // At least on LL 3.3.4, this is not strictly necessary - a teleport will succeed without sending this to | ||
495 | // the viewer. However, it might mean that the viewer does not see the black teleport screen (untested). | ||
495 | sp.ControllingClient.SendTeleportStart(teleportFlags); | 496 | sp.ControllingClient.SendTeleportStart(teleportFlags); |
496 | 497 | ||
497 | // the avatar.Close below will clear the child region list. We need this below for (possibly) | 498 | // the avatar.Close below will clear the child region list. We need this below for (possibly) |
@@ -567,8 +568,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
567 | // So let's wait | 568 | // So let's wait |
568 | Thread.Sleep(200); | 569 | Thread.Sleep(200); |
569 | 570 | ||
571 | // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears | ||
572 | // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly | ||
573 | // only on TeleportFinish). This is untested for region teleport between different simulators | ||
574 | // though this probably also works. | ||
570 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 575 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); |
571 | |||
572 | } | 576 | } |
573 | else | 577 | else |
574 | { | 578 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c8e7156..45d512b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4345,8 +4345,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
4345 | return false; | 4345 | return false; |
4346 | } | 4346 | } |
4347 | 4347 | ||
4348 | // We have to wait until the viewer contacts this region after receiving EAC. | 4348 | // We have to wait until the viewer contacts this region |
4349 | // That calls AddNewClient, which finally creates the ScenePresence | 4349 | // after receiving the EnableSimulator HTTP Event Queue message. This triggers the viewer to send |
4350 | // a UseCircuitCode packet which in turn calls AddNewClient which finally creates the ScenePresence. | ||
4350 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 4351 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
4351 | 4352 | ||
4352 | if (childAgentUpdate != null) | 4353 | if (childAgentUpdate != null) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 49f0ef7..7cf193d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -59,6 +59,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
59 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; | 59 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; |
60 | using PrimType = OpenSim.Region.Framework.Scenes.PrimType; | 60 | using PrimType = OpenSim.Region.Framework.Scenes.PrimType; |
61 | using AssetLandmark = OpenSim.Framework.AssetLandmark; | 61 | using AssetLandmark = OpenSim.Framework.AssetLandmark; |
62 | using RegionFlags = OpenSim.Framework.RegionFlags; | ||
62 | 63 | ||
63 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | 64 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; |
64 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | 65 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; |
@@ -6918,7 +6919,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6918 | GridInstantMessage msg = new GridInstantMessage(World, | 6919 | GridInstantMessage msg = new GridInstantMessage(World, |
6919 | m_host.OwnerID, m_host.Name, destID, | 6920 | m_host.OwnerID, m_host.Name, destID, |
6920 | (byte)InstantMessageDialog.TaskInventoryOffered, | 6921 | (byte)InstantMessageDialog.TaskInventoryOffered, |
6921 | false, string.Format("'{0}'"), | 6922 | false, string.Format("'{0}'", category), |
6922 | // We won't go so far as to add a SLURL, but this is the format used by LL as of 2012-10-06 | 6923 | // We won't go so far as to add a SLURL, but this is the format used by LL as of 2012-10-06 |
6923 | // false, string.Format("'{0}' ( http://slurl.com/secondlife/{1}/{2}/{3}/{4} )", category, World.Name, (int)pos.X, (int)pos.Y, (int)pos.Z), | 6924 | // false, string.Format("'{0}' ( http://slurl.com/secondlife/{1}/{2}/{3}/{4} )", category, World.Name, (int)pos.X, (int)pos.Y, (int)pos.Z), |
6924 | folderID, false, pos, | 6925 | folderID, false, pos, |
@@ -10058,11 +10059,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10058 | 10059 | ||
10059 | GridRegion info; | 10060 | GridRegion info; |
10060 | 10061 | ||
10061 | if (m_ScriptEngine.World.RegionInfo.RegionName == simulator) //Det data for this simulator? | 10062 | if (World.RegionInfo.RegionName == simulator) |
10062 | 10063 | info = new GridRegion(World.RegionInfo); | |
10063 | info = new GridRegion(m_ScriptEngine.World.RegionInfo); | ||
10064 | else | 10064 | else |
10065 | info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator); | 10065 | info = World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator); |
10066 | 10066 | ||
10067 | switch (data) | 10067 | switch (data) |
10068 | { | 10068 | { |
@@ -10072,9 +10072,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10072 | ScriptSleep(1000); | 10072 | ScriptSleep(1000); |
10073 | return UUID.Zero.ToString(); | 10073 | return UUID.Zero.ToString(); |
10074 | } | 10074 | } |
10075 | if (m_ScriptEngine.World.RegionInfo.RegionName != simulator) | 10075 | |
10076 | bool isHypergridRegion = false; | ||
10077 | |||
10078 | if (World.RegionInfo.RegionName != simulator && info.RegionSecret != "") | ||
10079 | { | ||
10080 | // Hypergrid is currently placing real destination region co-ords into RegionSecret. | ||
10081 | // But other code can also use this field for a genuine RegionSecret! Therefore, if | ||
10082 | // anything is present we need to disambiguate. | ||
10083 | // | ||
10084 | // FIXME: Hypergrid should be storing this data in a different field. | ||
10085 | RegionFlags regionFlags | ||
10086 | = (RegionFlags)m_ScriptEngine.World.GridService.GetRegionFlags( | ||
10087 | info.ScopeID, info.RegionID); | ||
10088 | isHypergridRegion = (regionFlags & RegionFlags.Hyperlink) != 0; | ||
10089 | } | ||
10090 | |||
10091 | if (isHypergridRegion) | ||
10076 | { | 10092 | { |
10077 | //Hypergrid Region co-ordinates | ||
10078 | uint rx = 0, ry = 0; | 10093 | uint rx = 0, ry = 0; |
10079 | Utils.LongToUInts(Convert.ToUInt64(info.RegionSecret), out rx, out ry); | 10094 | Utils.LongToUInts(Convert.ToUInt64(info.RegionSecret), out rx, out ry); |
10080 | 10095 | ||
@@ -10085,7 +10100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10085 | } | 10100 | } |
10086 | else | 10101 | else |
10087 | { | 10102 | { |
10088 | //Local-cooridnates | 10103 | // Local grid co-oridnates |
10089 | reply = new LSL_Vector( | 10104 | reply = new LSL_Vector( |
10090 | info.RegionLocX, | 10105 | info.RegionLocX, |
10091 | info.RegionLocY, | 10106 | info.RegionLocY, |
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 6cd21d1..4ec1edc 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | |||
@@ -154,7 +154,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
154 | if (!region.ServerURI.EndsWith("/")) | 154 | if (!region.ServerURI.EndsWith("/")) |
155 | path = "/" + path; | 155 | path = "/" + path; |
156 | string uri = region.ServerURI + path; | 156 | string uri = region.ServerURI + path; |
157 | m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri); | 157 | // m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri); |
158 | 158 | ||
159 | try | 159 | try |
160 | { | 160 | { |