From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- .../ContentManagementSystem/CMController.cs | 36 ++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs') diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs index 6ccb646..072de5e 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs @@ -39,7 +39,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading; -using libsecondlife; +using OpenMetaverse; using OpenSim; using OpenSim.Framework; @@ -49,8 +49,6 @@ using OpenSim.Region.Physics.Manager; using log4net; -using Axiom.Math; - namespace OpenSim.Region.Environment.Modules.ContentManagement { /// @@ -266,7 +264,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// /// Only called by the MainLoop. /// - private void UndoDid(CMModel model, CMView view, LLUUID uuid) + private void UndoDid(CMModel model, CMView view, UUID uuid) { if ((m_state & State.SHOWING_CHANGES) > 0) { @@ -289,7 +287,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_WorkQueue.Enqueue(moreWork); } - protected void ObjectDuplicated(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID) + protected void ObjectDuplicated(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, UUID GroupID) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTDUPLICATED; @@ -298,8 +296,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] dup queue"); } - protected void ObjectDuplicatedOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, - LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, + protected void ObjectDuplicatedOnRay(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID, + UUID RayTargetObj, Vector3 RayEnd, Vector3 RayStart, bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { Work moreWork = new Work(); @@ -318,7 +316,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] new client"); } - protected void OnUnDid(IClientAPI remoteClient, LLUUID primId) + protected void OnUnDid(IClientAPI remoteClient, UUID primId) { Work moreWork = new Work(); moreWork.Type = WorkType.UNDODID; @@ -405,7 +403,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// /// /// - protected void StopManaging(LLUUID clientUUID) + protected void StopManaging(UUID clientUUID) { foreach(Object sceneobj in m_sceneList.Values) { @@ -433,7 +431,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement } } - protected void UpdateMultiplePosition(uint localID, LLVector3 pos, IClientAPI remoteClient) + protected void UpdateMultiplePosition(uint localID, Vector3 pos, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -442,7 +440,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] pos"); } - protected void UpdateMultipleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient) + protected void UpdateMultipleRotation(uint localID, Quaternion rot, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -451,7 +449,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] rot"); } - protected void UpdateMultipleScale(uint localID, LLVector3 scale, IClientAPI remoteClient) + protected void UpdateMultipleScale(uint localID, Vector3 scale, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -460,8 +458,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT]scale"); } - protected void UpdateNewParts(LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, PrimitiveBaseShape shape, - byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, + protected void UpdateNewParts(UUID ownerID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape, + byte bypassRaycast, Vector3 RayStart, UUID RayTargetID, byte RayEndIsIntersection) { Work moreWork = new Work(); @@ -471,7 +469,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] new parts"); } - protected void UpdateSinglePosition(uint localID, LLVector3 pos, IClientAPI remoteClient) + protected void UpdateSinglePosition(uint localID, Vector3 pos, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -483,7 +481,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// /// /// - protected void UpdateSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient) + protected void UpdateSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -492,7 +490,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Debug("[CONTENT MANAGEMENT] rot"); } - protected void UpdateSingleScale(uint localID, LLVector3 scale, IClientAPI remoteClient) + protected void UpdateSingleScale(uint localID, Vector3 scale, IClientAPI remoteClient) { Work moreWork = new Work(); moreWork.Type = WorkType.OBJECTATTRIBUTECHANGE; @@ -723,7 +721,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public Object Data2; //Just more space for holding data. public uint LocalId; //Convenient public WorkType Type; - public LLUUID UUID; //Convenient + public UUID UUID; //Convenient #endregion Fields } @@ -745,4 +743,4 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement #endregion Other } -} \ No newline at end of file +} -- cgit v1.1