diff options
author | Melanie | 2010-10-05 02:12:35 +0100 |
---|---|---|
committer | Melanie | 2010-10-05 02:12:35 +0100 |
commit | ba0a19c228b8d9bce0a9fc2328e69ba48befab66 (patch) | |
tree | d20a2049e2b4f49908f60e21988cd6b0bfc02aaa /OpenSim/Region | |
parent | Make windlight set the default environment on start (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.zip opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.gz opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.bz2 opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
7 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 28c50ab..457e0bb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
307 | /// <param name="remoteClient"></param> | 307 | /// <param name="remoteClient"></param> |
308 | /// <param name="itemID"></param> | 308 | /// <param name="itemID"></param> |
309 | /// <param name="AttachmentPt"></param> | 309 | /// <param name="AttachmentPt"></param> |
310 | /// <returns></returns> | 310 | /// <returns></returns> |
311 | protected UUID ShowAttachInUserInventory( | 311 | protected UUID ShowAttachInUserInventory( |
312 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 312 | SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
313 | { | 313 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 7a21d5e..b3f0a25 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -318,12 +318,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
318 | 318 | ||
319 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID); | 319 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID); |
320 | 320 | ||
321 | PresenceInfo presence = null; | 321 | PresenceInfo presence = null; |
322 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); | 322 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); |
323 | if (presences != null && presences.Length > 0) | 323 | if (presences != null && presences.Length > 0) |
324 | presence = presences[0]; | 324 | presence = presences[0]; |
325 | if (presence != null) | 325 | if (presence != null) |
326 | im.offline = 0; | 326 | im.offline = 0; |
327 | 327 | ||
328 | im.fromAgentID = fromAgentID.Guid; | 328 | im.fromAgentID = fromAgentID.Guid; |
329 | im.fromAgentName = account.FirstName + " " + account.LastName; | 329 | im.fromAgentName = account.FirstName + " " + account.LastName; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a8e76e3..8140d42 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2763,7 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2763 | UUID = UUID.Random(); | 2763 | UUID = UUID.Random(); |
2764 | LinkNum = linkNum; | 2764 | LinkNum = linkNum; |
2765 | LocalId = 0; | 2765 | LocalId = 0; |
2766 | Inventory.ResetInventoryIDs(); | 2766 | Inventory.ResetInventoryIDs(); |
2767 | } | 2767 | } |
2768 | 2768 | ||
2769 | /// <summary> | 2769 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a4533fa..13d9964 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1523 | } | 1523 | } |
1524 | 1524 | ||
1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, | 1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, |
1526 | // which occurs later in the main scene loop | 1526 | // which occurs later in the main scene loop |
1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) | 1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) |
1528 | { | 1528 | { |
1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index e6ff0c0..5616a4e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
210 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 210 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
211 | { Name = childPartName, UUID = childPartUuid }; | 211 | { Name = childPartName, UUID = childPartUuid }; |
212 | 212 | ||
213 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); | 213 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); |
214 | sog.AddPart(linkPart); | 214 | sog.AddPart(linkPart); |
215 | 215 | ||
216 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); | 216 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); |
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
221 | sog.UUID = newRootPartUuid; | 221 | sog.UUID = newRootPartUuid; |
222 | 222 | ||
223 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); | 223 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); |
224 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); | 224 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); |
225 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); | 225 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); |
226 | } | 226 | } |
227 | } | 227 | } |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index e42dbf2..7e1b5ac 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -812,7 +812,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an | 812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an |
813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module | 813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module |
814 | // didn't check the client sent data against the object do any. Since the base modules are the | 814 | // didn't check the client sent data against the object do any. Since the base modules are the |
815 | // 'crowning glory' examples of good practice.. | 815 | // 'crowning glory' examples of good practice.. |
816 | 816 | ||
817 | // Validate that the object exists in the scene the user is in | 817 | // Validate that the object exists in the scene the user is in |
818 | SceneObjectPart part = s.GetSceneObjectPart(localID); | 818 | SceneObjectPart part = s.GetSceneObjectPart(localID); |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index c37c9bd..c91658e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
188 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 188 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, |
189 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) | 189 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) |
190 | { | 190 | { |
191 | Name = primName; | 191 | Name = primName; |
192 | m_vehicle = new ODEDynamics(); | 192 | m_vehicle = new ODEDynamics(); |
193 | //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned); | 193 | //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned); |
194 | ode = dode; | 194 | ode = dode; |
@@ -620,7 +620,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
620 | volume *= (1.0f - hollowVolume); | 620 | volume *= (1.0f - hollowVolume); |
621 | } | 621 | } |
622 | } | 622 | } |
623 | break; | 623 | break; |
624 | 624 | ||
625 | default: | 625 | default: |
626 | break; | 626 | break; |
@@ -658,7 +658,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
658 | 658 | ||
659 | taperY = _pbs.PathTaperY * 0.01f; | 659 | taperY = _pbs.PathTaperY * 0.01f; |
660 | if (taperY < 0.0f) | 660 | if (taperY < 0.0f) |
661 | taperY = -taperY; | 661 | taperY = -taperY; |
662 | taperY1 = 1.0f - taperY; | 662 | taperY1 = 1.0f - taperY; |
663 | 663 | ||
664 | } | 664 | } |
@@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | foreach (OdePrim prm in childrenPrim) | 1061 | foreach (OdePrim prm in childrenPrim) |
1062 | { | 1062 | { |
1063 | prm.m_collisionCategories |= CollisionCategories.Body; | 1063 | prm.m_collisionCategories |= CollisionCategories.Body; |
1064 | prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind); | 1064 | prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind); |
1065 | 1065 | ||