diff options
author | Melanie | 2009-12-20 16:45:28 +0000 |
---|---|---|
committer | Melanie | 2009-12-20 16:45:28 +0000 |
commit | 3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch) | |
tree | b22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Region | |
parent | Merge branch 'casper' (diff) | |
parent | Fix a case where an idle sim can eat 100% of a core (diff) | |
download | opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2 opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
5 files changed, 20 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 4d347cd..93cb60c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -405,6 +405,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
405 | if (parts.Length >= 2) | 405 | if (parts.Length >= 2) |
406 | { | 406 | { |
407 | portstr = parts[1]; | 407 | portstr = parts[1]; |
408 | //m_log.Debug("-- port = " + portstr); | ||
408 | if (!UInt32.TryParse(portstr, out port)) | 409 | if (!UInt32.TryParse(portstr, out port)) |
409 | regionName = parts[1]; | 410 | regionName = parts[1]; |
410 | } | 411 | } |
@@ -620,8 +621,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
620 | clonedRegion.RegionLocX = (int)x; | 621 | clonedRegion.RegionLocX = (int)x; |
621 | clonedRegion.RegionLocY = (int)y; | 622 | clonedRegion.RegionLocY = (int)y; |
622 | 623 | ||
623 | // Get the user's home region information | 624 | // Get the user's home region information and adapt the region handle |
624 | GridRegion home = m_aScene.GridService.GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID); | 625 | GridRegion home = GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID); |
626 | if (m_HyperlinkHandles.ContainsKey(uinfo.UserProfile.HomeRegionID)) | ||
627 | { | ||
628 | ulong realHandle = m_HyperlinkHandles[uinfo.UserProfile.HomeRegionID]; | ||
629 | Utils.LongToUInts(realHandle, out x, out y); | ||
630 | m_log.DebugFormat("[HGrid]: Foreign user is going elsewhere. Adjusting home handle from {0}-{1} to {2}-{3}", home.RegionLocX, home.RegionLocY, x, y); | ||
631 | home.RegionLocX = (int)x; | ||
632 | home.RegionLocY = (int)y; | ||
633 | } | ||
625 | 634 | ||
626 | // Get the user's service URLs | 635 | // Get the user's service URLs |
627 | string serverURI = ""; | 636 | string serverURI = ""; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs index d9f6e33..bdfe3b1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs | |||
@@ -157,7 +157,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
157 | } | 157 | } |
158 | 158 | ||
159 | // m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); | 159 | // m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); |
160 | reason = "Did not find region."; | 160 | uint x = 0, y = 0; |
161 | Utils.LongToUInts(regionHandle, out x, out y); | ||
162 | reason = "Did not find region " + x + "-" + y; | ||
161 | return false; | 163 | return false; |
162 | } | 164 | } |
163 | 165 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 20cae5d..265129c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
1329 | maintc = (int)(m_timespan * 1000) - maintc; | 1329 | maintc = (int)(m_timespan * 1000) - maintc; |
1330 | 1330 | ||
1331 | if ((maintc < (m_timespan * 1000)) && maintc > 0) | 1331 | if (maintc > 0) |
1332 | Thread.Sleep(maintc); | 1332 | Thread.Sleep(maintc); |
1333 | 1333 | ||
1334 | // Tell the watchdog that this thread is still alive | 1334 | // Tell the watchdog that this thread is still alive |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 865f649..cbd169a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
128 | private Vector3? m_forceToApply; | 128 | private Vector3? m_forceToApply; |
129 | private uint m_requestedSitTargetID; | 129 | private uint m_requestedSitTargetID; |
130 | private UUID m_requestedSitTargetUUID; | 130 | private UUID m_requestedSitTargetUUID; |
131 | private Vector3 m_requestedSitOffset; | 131 | |
132 | private SendCourseLocationsMethod m_sendCourseLocationsMethod; | 132 | private SendCourseLocationsMethod m_sendCourseLocationsMethod; |
133 | 133 | ||
134 | private bool m_startAnimationSet; | 134 | private bool m_startAnimationSet; |
@@ -1898,7 +1898,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1898 | m_nextSitAnimation = part.SitAnimation; | 1898 | m_nextSitAnimation = part.SitAnimation; |
1899 | } | 1899 | } |
1900 | m_requestedSitTargetID = part.LocalId; | 1900 | m_requestedSitTargetID = part.LocalId; |
1901 | m_requestedSitOffset = offset; | 1901 | //m_requestedSitOffset = offset; |
1902 | m_requestedSitTargetUUID = targetID; | 1902 | m_requestedSitTargetUUID = targetID; |
1903 | 1903 | ||
1904 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); | 1904 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); |
@@ -2131,7 +2131,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2131 | if (part != null) | 2131 | if (part != null) |
2132 | { | 2132 | { |
2133 | m_requestedSitTargetID = part.LocalId; | 2133 | m_requestedSitTargetID = part.LocalId; |
2134 | m_requestedSitOffset = offset; | 2134 | //m_requestedSitOffset = offset; |
2135 | m_requestedSitTargetUUID = targetID; | 2135 | m_requestedSitTargetUUID = targetID; |
2136 | 2136 | ||
2137 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); | 2137 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e694f15..2da498a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4476,8 +4476,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4476 | 4476 | ||
4477 | double x, y, z, s, t; | 4477 | double x, y, z, s, t; |
4478 | 4478 | ||
4479 | s = Math.Cos(angle / 2); | 4479 | s = Math.Cos(angle * 0.5); |
4480 | t = Math.Sin(angle / 2); // temp value to avoid 2 more sin() calcs | 4480 | t = Math.Sin(angle * 0.5); // temp value to avoid 2 more sin() calcs |
4481 | x = axis.x * t; | 4481 | x = axis.x * t; |
4482 | y = axis.y * t; | 4482 | y = axis.y * t; |
4483 | z = axis.z * t; | 4483 | z = axis.z * t; |