diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-13 12:39:46 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-13 12:39:46 -0400 |
commit | 9bcca3dc95450103b0c02949034f2b979632f07b (patch) | |
tree | ff92eca3681692391fe6e106856f0c9524885d22 | |
parent | * minor: comments (diff) | |
parent | Some small fixes (diff) | |
download | opensim-SC_OLD-9bcca3dc95450103b0c02949034f2b979632f07b.zip opensim-SC_OLD-9bcca3dc95450103b0c02949034f2b979632f07b.tar.gz opensim-SC_OLD-9bcca3dc95450103b0c02949034f2b979632f07b.tar.bz2 opensim-SC_OLD-9bcca3dc95450103b0c02949034f2b979632f07b.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
6 files changed, 74 insertions, 36 deletions
diff --git a/OpenSim/Framework/IProfileModule.cs b/OpenSim/Framework/IProfileModule.cs new file mode 100644 index 0000000..f54810e --- /dev/null +++ b/OpenSim/Framework/IProfileModule.cs | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections; | ||
29 | using OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework | ||
32 | { | ||
33 | public interface IProfileModule | ||
34 | { | ||
35 | Hashtable GetProfileData(UUID userID); | ||
36 | } | ||
37 | } | ||
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 99a4057..381070e 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |||
@@ -40,9 +40,6 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
40 | { | 40 | { |
41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 | 41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 |
42 | { | 42 | { |
43 | private static readonly ILog m_log | ||
44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
46 | IHyperlink m_osw = null; | 43 | IHyperlink m_osw = null; |
47 | public IHyperlink HGServices | 44 | public IHyperlink HGServices |
48 | { | 45 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index d3324e4..0f58788 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
29 | using System.Globalization; | 30 | using System.Globalization; |
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
@@ -41,6 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
41 | { | 42 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | private Scene m_scene; | 44 | private Scene m_scene; |
45 | private IProfileModule m_profileModule = null; | ||
44 | 46 | ||
45 | public AvatarProfilesModule() | 47 | public AvatarProfilesModule() |
46 | { | 48 | { |
@@ -56,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
56 | 58 | ||
57 | public void PostInitialise() | 59 | public void PostInitialise() |
58 | { | 60 | { |
61 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); | ||
59 | } | 62 | } |
60 | 63 | ||
61 | public void Close() | 64 | public void Close() |
@@ -108,6 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
108 | charterMember = Utils.StringToBytes(profile.CustomType); | 111 | charterMember = Utils.StringToBytes(profile.CustomType); |
109 | } | 112 | } |
110 | 113 | ||
114 | if (m_profileModule != null) | ||
115 | { | ||
116 | Hashtable profileData = m_profileModule.GetProfileData(remoteClient.AgentId); | ||
117 | if (profileData["ProfileUrl"] != null) | ||
118 | profile.ProfileUrl = profileData["ProfileUrl"].ToString(); | ||
119 | } | ||
111 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, | 120 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, |
112 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), | 121 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), |
113 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), | 122 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), |
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 1d4d6d7..7bbe045 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; | 429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; |
430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; | 430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; |
431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; | 431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; |
432 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 432 | // TODO: unused: private ScriptTimerEvent handlerScriptTimerEvent = null; |
433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; | 433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; |
434 | 434 | ||
435 | private ScriptColliding handlerCollidingStart = null; | 435 | private ScriptColliding handlerCollidingStart = null; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 61dfa52..3646811 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1098,30 +1098,29 @@ if (m_shape != null) { | |||
1098 | } | 1098 | } |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | private void handleTimerAccounting(uint localID, double interval) | 1101 | // TODO: unused: |
1102 | { | 1102 | // private void handleTimerAccounting(uint localID, double interval) |
1103 | if (localID == LocalId) | 1103 | // { |
1104 | { | 1104 | // if (localID == LocalId) |
1105 | 1105 | // { | |
1106 | float sec = (float)interval; | 1106 | // float sec = (float)interval; |
1107 | if (m_parentGroup != null) | 1107 | // if (m_parentGroup != null) |
1108 | { | 1108 | // { |
1109 | if (sec == 0) | 1109 | // if (sec == 0) |
1110 | { | 1110 | // { |
1111 | if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) | 1111 | // if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) |
1112 | m_parentGroup.scriptScore = 0; | 1112 | // m_parentGroup.scriptScore = 0; |
1113 | 1113 | // | |
1114 | m_parentGroup.scriptScore += 0.001f; | 1114 | // m_parentGroup.scriptScore += 0.001f; |
1115 | return; | 1115 | // return; |
1116 | } | 1116 | // } |
1117 | 1117 | // | |
1118 | if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) | 1118 | // if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) |
1119 | m_parentGroup.scriptScore = 0; | 1119 | // m_parentGroup.scriptScore = 0; |
1120 | m_parentGroup.scriptScore += (0.001f / sec); | 1120 | // m_parentGroup.scriptScore += (0.001f / sec); |
1121 | } | 1121 | // } |
1122 | 1122 | // } | |
1123 | } | 1123 | // } |
1124 | } | ||
1125 | 1124 | ||
1126 | #endregion Private Methods | 1125 | #endregion Private Methods |
1127 | 1126 | ||
@@ -1248,7 +1247,6 @@ if (m_shape != null) { | |||
1248 | } | 1247 | } |
1249 | } | 1248 | } |
1250 | 1249 | ||
1251 | |||
1252 | /// <summary> | 1250 | /// <summary> |
1253 | /// hook to the physics scene to apply angular impulse | 1251 | /// hook to the physics scene to apply angular impulse |
1254 | /// This is sent up to the group, which then finds the root prim | 1252 | /// This is sent up to the group, which then finds the root prim |
@@ -1809,7 +1807,6 @@ if (m_shape != null) { | |||
1809 | m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f); | 1807 | m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f); |
1810 | } | 1808 | } |
1811 | 1809 | ||
1812 | |||
1813 | public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient) | 1810 | public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient) |
1814 | { | 1811 | { |
1815 | } | 1812 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index e435ac1..8fdc5a7 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -304,12 +304,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); | 304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); |
305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); | 305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); |
306 | 306 | ||
307 | private uint heightmapWidth = m_regionWidth + 1; | 307 | // TODO: unused: private uint heightmapWidth = m_regionWidth + 1; |
308 | private uint heightmapHeight = m_regionHeight + 1; | 308 | // TODO: unused: private uint heightmapHeight = m_regionHeight + 1; |
309 | 309 | // TODO: unused: private uint heightmapWidthSamples; | |
310 | private uint heightmapWidthSamples; | 310 | // TODO: unused: private uint heightmapHeightSamples; |
311 | |||
312 | private uint heightmapHeightSamples; | ||
313 | 311 | ||
314 | private volatile int m_global_contactcount = 0; | 312 | private volatile int m_global_contactcount = 0; |
315 | 313 | ||