From fae34bb10cfa10702faf5c19d8c8517faa018cb5 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 9 Sep 2008 01:26:48 +0000 Subject: Update svn properties, formatting cleanup. --- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 +- OpenSim/Data/MySQL/MySQLEstateData.cs | 2 +- OpenSim/Data/MySQL/MySQLUserData.cs | 2 +- OpenSim/Data/SQLite/SQLiteEstateData.cs | 2 +- .../Communications/Cache/FileAssetClient.cs | 4 +- OpenSim/Framework/Communications/LoginService.cs | 6 +- OpenSim/Framework/IClientAPI.cs | 2 +- OpenSim/Framework/Util.cs | 4 +- OpenSim/Grid/UserServer/UserLoginService.cs | 30 +- .../Region/ClientStack/LindenUDP/LLClientView.cs | 14 +- .../Region/ClientStack/LindenUDP/LLUDPServer.cs | 18 +- .../Communications/Local/LocalLoginService.cs | 2 +- .../Region/Communications/OGS1/OGS1GridServices.cs | 10 +- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 2 +- .../Currency/SampleMoney/SampleMoneyModule.cs | 26 +- .../ContentManagementSystem/AuraMetaEntity.cs | 70 ++-- .../ContentManagementSystem/BeamMetaEntity.cs | 56 +-- .../ContentManagementSystem/CMController.cs | 394 ++++++++++----------- .../ContentManagementSystem/CMEntityCollection.cs | 52 +-- .../Modules/ContentManagementSystem/CMModel.cs | 48 +-- .../Modules/ContentManagementSystem/CMView.cs | 44 +-- .../ContentManagementEntity.cs | 310 ++++++++-------- .../ContentManagementModule.cs | 10 +- .../ContentManagementSystem/FileSystemDatabase.cs | 159 +++++---- .../Modules/ContentManagementSystem/MetaEntity.cs | 68 ++-- .../ContentManagementSystem/PointMetaEntity.cs | 2 +- .../SceneObjectGroupDiff.cs | 74 ++-- .../Archiver/ArchiveWriteRequestPreparation.cs | 4 +- .../Modules/World/Estate/EstateManagementModule.cs | 2 +- .../Environment/Modules/World/NPC/NPCAvatar.cs | 8 +- OpenSim/Region/Environment/Scenes/EntityList.cs | 12 +- OpenSim/Region/Environment/Scenes/InnerScene.cs | 4 +- .../Region/Environment/Scenes/SceneObjectGroup.cs | 2 +- .../Region/Environment/Scenes/SceneObjectPart.cs | 2 +- .../Region/Examples/SimpleModule/MyNpcCharacter.cs | 8 +- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 +- OpenSim/Region/Physics/Meshing/PrimMesher.cs | 182 +++++----- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 4 +- .../Shared/Api/Implementation/LSL_Api.cs | 4 +- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 22 +- 41 files changed, 840 insertions(+), 833 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index d267e41..ff9d860 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs @@ -644,7 +644,7 @@ VALUES using (AutoClosingSqlCommand cmd = _Database.Query(sql)) { cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID.ToString())); - using(SqlDataReader reader = cmd.ExecuteReader()) + using (SqlDataReader reader = cmd.ExecuteReader()) { if (reader.Read()) { @@ -1519,7 +1519,7 @@ VALUES dataAdapter.InsertCommand = commandBuilder.GetInsertCommand(true); dataAdapter.UpdateCommand = commandBuilder.GetUpdateCommand(true); - dataAdapter.DeleteCommand = commandBuilder.GetDeleteCommand(true); + dataAdapter.DeleteCommand = commandBuilder.GetDeleteCommand(true); } #endregion } diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 8eddec6..57151b3 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL else m_FieldMap[name].SetValue(es, false); } - else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) + else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) { UUID uuid = UUID.Zero; diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 42983b1..81acbfb 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -79,7 +79,7 @@ namespace OpenSim.Data.MySQL m_lastConnect++; // Overflow protection - if(m_lastConnect == int.MaxValue) + if (m_lastConnect == int.MaxValue) m_lastConnect = 0; MySQLSuperManager x = m_dbconnections[m_lastConnect%m_maxConnections]; diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index 1245caa..f95932d 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs @@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite else m_FieldMap[name].SetValue(es, false); } - else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) + else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) { UUID uuid = UUID.Zero; diff --git a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs index e793feb..17282a1 100644 --- a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs @@ -6,11 +6,11 @@ namespace OpenSim.Framework.Communications.Cache public class FileAssetClient : AssetServerBase { private readonly string m_dir; - private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); + private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); public FileAssetClient(string dir) { - if(!Directory.Exists(dir)) + if (!Directory.Exists(dir)) { Directory.CreateDirectory(dir); } diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 42292f3..7cdbf6c 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications } /// - /// Customises the login response and fills in missing values. This method also tells the login region to + /// Customises the login response and fills in missing values. This method also tells the login region to /// expect a client connection. /// /// The existing response @@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications public virtual void LogOffUser(UserProfileData theUser, string message) { } - + /// /// Get the initial login inventory skeleton (in other words, the folder structure) for the given user. /// @@ -298,7 +298,7 @@ namespace OpenSim.Framework.Communications m_log.DebugFormat( "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.", firstname, lastname); - + return logResponse.ToXmlRpcResponse(); } else diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a7baf0e..e1c6f4b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -325,7 +325,7 @@ namespace OpenSim.Framework ulong ActiveGroupPowers { get; } - ulong GetGroupPowers(UUID groupID); + ulong GetGroupPowers(UUID groupID); string FirstName { get; } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 427832d..d289978 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -737,11 +737,11 @@ namespace OpenSim.Framework /// The extracted ulong /// public static ulong BytesToUInt64Big(byte[] bytes) { - if(bytes.Length < 8) return 0; + if (bytes.Length < 8) return 0; return ((ulong)bytes[0] << 56) | ((ulong)bytes[1] << 48) | ((ulong)bytes[2] << 40) | ((ulong)bytes[3] << 32) | ((ulong)bytes[4] << 24) | ((ulong)bytes[5] << 16) | ((ulong)bytes[6] << 8) | (ulong)bytes[7]; } - + // used for RemoteParcelRequest (for "About Landmark") public static UUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { byte[] bytes = { diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index f22e084..07b29bd 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -194,13 +194,13 @@ namespace OpenSim.Grid.UserServer { start_x = Convert.ToInt32(startLocationRequestParsed[1]); start_y = Convert.ToInt32(startLocationRequestParsed[2]); - start_z = Convert.ToInt32(startLocationRequestParsed[3]); - + start_z = Convert.ToInt32(startLocationRequestParsed[3]); + if (start_x >= 0 && start_y >= 0 && start_z >= 0) { Vector3 tmp_v = new Vector3(start_x, start_y, start_z); theUser.CurrentAgent.Position = tmp_v; - } + } } } } @@ -242,7 +242,7 @@ namespace OpenSim.Grid.UserServer // Load information from the gridserver ulong defaultHandle = (((ulong) m_config.DefaultX * Constants.RegionSize) << 32) | ((ulong) m_config.DefaultY * Constants.RegionSize); - + if (defaultHandle == SimInfo.regionHandle) { m_log.ErrorFormat("[LOGIN]: Not trying the default region since this is the same as the selected region"); @@ -250,7 +250,7 @@ namespace OpenSim.Grid.UserServer } m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead"); - + SimInfo = RegionProfileData.RequestSimProfileData(defaultHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); // Customise the response @@ -260,18 +260,18 @@ namespace OpenSim.Grid.UserServer (SimInfo.regionLocX * Constants.RegionSize), (SimInfo.regionLocY*Constants.RegionSize), theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z, - theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z); - + theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z); + if (!PrepareLoginToRegion(SimInfo, theUser, response)) { response.CreateDeadRegionResponse(); return false; } } - + return true; } - + /// /// Prepare a login to the given region. This involves both telling the region to expect a connection /// and appropriately customising the response to the user. @@ -283,7 +283,7 @@ namespace OpenSim.Grid.UserServer private bool PrepareLoginToRegion(RegionProfileData sim, UserProfileData user, LoginResponse response) { try - { + { response.SimAddress = Util.GetHostFromURL(sim.serverURI).ToString(); response.SimPort = uint.Parse(sim.serverURI.Split(new char[] {'/', ':'})[4]); response.RegionX = sim.regionLocX; @@ -300,7 +300,7 @@ namespace OpenSim.Grid.UserServer // Update agent with target sim user.CurrentAgent.Region = sim.UUID; - user.CurrentAgent.Handle = sim.regionHandle; + user.CurrentAgent.Handle = sim.regionHandle; // Prepare notification Hashtable SimParams = new Hashtable(); @@ -317,7 +317,7 @@ namespace OpenSim.Grid.UserServer SimParams["caps_path"] = capsPath; ArrayList SendParams = new ArrayList(); SendParams.Add(SimParams); - + // Send XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcResponse GridResp = GridReq.Send(sim.httpServerURI, 30000); @@ -363,13 +363,13 @@ namespace OpenSim.Grid.UserServer m_log.ErrorFormat("[LOGIN]: XmlRpc request to region failed with message {0}, code {1} ", GridResp.FaultString, GridResp.FaultCode); return false; } - } + } catch (Exception e) { m_log.ErrorFormat("[LOGIN]: Region not available for login, {0}", e); return false; - } - + } + return true; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 356dee8..3c860a9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected UUID m_activeGroupID = UUID.Zero; protected string m_activeGroupName = String.Empty; protected ulong m_activeGroupPowers = 0; - protected Dictionary m_groupPowers = new Dictionary(); + protected Dictionary m_groupPowers = new Dictionary(); /* Instantiated Designated Event Delegates */ //- used so we don't create new objects for each incoming packet and then toss it out later */ @@ -302,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP get { return m_activeGroupPowers; } } - public ulong GetGroupPowers(UUID groupID) + public ulong GetGroupPowers(UUID groupID) { if (m_groupPowers.ContainsKey(groupID)) return m_groupPowers[groupID]; @@ -645,7 +645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual void ClientLoop() { m_log.Info("[CLIENT]: Entered main packet processing loop"); - + while (true) { LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); @@ -683,10 +683,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (m_PacketHandler.PacketsReceived == m_inPacketsChecked) { // no packet came in since the last time we checked... - + m_probesWithNoIngressPackets++; if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active - || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused + || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused { m_clientPingTimer.Enabled = false; @@ -709,7 +709,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Something received in the meantime - we can reset the counters m_probesWithNoIngressPackets = 0; - // ... and store the current number of packets received to find out if another one got in on the next cycle + // ... and store the current number of packets received to find out if another one got in on the next cycle m_inPacketsChecked = m_PacketHandler.PacketsReceived; } @@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); AuthenticateResponse sessionInfo = m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode); - + if (!sessionInfo.Authorised) { //session/circuit not authorised diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 206216e..52a74e7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -58,12 +58,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected byte[] RecvBuffer = new byte[4096]; protected byte[] ZeroBuffer = new byte[8192]; protected IPEndPoint ipeSender; - + /// /// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods /// protected EndPoint epSender; - + protected EndPoint epProxy; protected int proxyPortOffset; protected AsyncCallback ReceivedData; @@ -75,7 +75,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); protected IScene m_localScene; protected AssetCache m_assetCache; - + /// /// Manages authentication for agent circuits /// @@ -260,12 +260,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ret = clientCircuits.TryGetValue(epSender, out circuit); } - + if (ret) { //if so then send packet to the packetserver //m_log.DebugFormat("[UDPSERVER]: For endpoint {0} got packet {1}", epSender, packet.Type); - + m_packetServer.InPacket(circuit, packet); } else if (packet.Type == PacketType.UseCircuitCode) @@ -358,8 +358,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; - - m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); + + m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); lock (clientCircuits) { @@ -386,10 +386,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (!PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_circuitManager, epProxy)) m_log.ErrorFormat( - "[CLIENT]: A circuit already existed for agent {0}, circuit {1}", + "[CLIENT]: A circuit already existed for agent {0}, circuit {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); } - + PacketPool.Instance.ReturnPacket(packet); } diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 7b93bfb..93a1e46 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -265,7 +265,7 @@ namespace OpenSim.Region.Communications.Local m_log.Warn("[LOGIN]: Not found region " + currentRegion); return false; } - + return true; } diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 2538eaf..3bd57cd 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -89,7 +89,7 @@ namespace OpenSim.Region.Communications.OGS1 { serversInfo = servers_info; httpServer = httpServe; - + //Respond to Grid Services requests httpServer.AddXmlRPCHandler("expect_user", ExpectUser); httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); @@ -602,7 +602,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// public XmlRpcResponse ExpectUser(XmlRpcRequest request) - { + { Hashtable requestData = (Hashtable) request.Params[0]; AgentCircuitData agentData = new AgentCircuitData(); agentData.SessionID = new UUID((string) requestData["session_id"]); @@ -613,7 +613,7 @@ namespace OpenSim.Region.Communications.OGS1 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); agentData.CapsPath = (string) requestData["caps_path"]; ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]); - + m_log.DebugFormat( "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}", agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode); @@ -669,7 +669,7 @@ namespace OpenSim.Region.Communications.OGS1 respdata["success"] = "TRUE"; resp.Value = respdata; } - + return resp; } // Grid Request Processing @@ -1679,7 +1679,7 @@ namespace OpenSim.Region.Communications.OGS1 // this might be cached, as we probably requested it just a moment ago... RegionInfo info = RequestNeighbourInfo(regionHandle); if (info != null) // just to be sure - { + { XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; XmlRpcResponse response = request.Send(uri, 10000); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index e1599a8..3132eb7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat string message = e.Message; UUID fromID = e.SenderUUID; - if(message.Length >= 1000) // libomv limit + if (message.Length >= 1000) // libomv limit message = message.Substring(0, 1000); if (e.Sender != null) diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 19c193f..8b7df9e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs @@ -820,33 +820,33 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney string secret = (string) requestData["secret"]; Scene userScene = GetSceneByUUID(regionId); - if(userScene != null) + if (userScene != null) { if (userScene.RegionInfo.regionSecret.ToString() == secret) { IClientAPI client = LocateClientObject(agentId); - if (client != null) - { - - if (soundId != UUID.Zero) - client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0); - - client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text); - - retparam.Add("success", true); - } + if (client != null) + { + + if (soundId != UUID.Zero) + client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0); + + client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text); + + retparam.Add("success", true); + } else { retparam.Add("success", false); } - } + } else { retparam.Add("success", false); } } - + ret.Value = retparam; return ret; } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs index dd592dd..aab863a 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs @@ -90,7 +90,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void SetAura(Vector3 color, float radius) { SceneObjectPart From = m_Entity.RootPart; - + //m_log.Debug("[META ENTITY] BEFORE: radius = " + radius); float burstRadius = 0.1f; Primitive.ParticleSystem.SourcePattern patternFlags = Primitive.ParticleSystem.SourcePattern.None; @@ -98,12 +98,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement float burstRate = 0.4f; if (radius >= 8.0f) { - //float sizeOfObject = radius / 2.0f; - burstRadius = (radius - 8.0f)/3f; - burstRate = 1.5f; - radius = 7.99f; - patternFlags = Primitive.ParticleSystem.SourcePattern.Explode; - age = 4.0f; + //float sizeOfObject = radius / 2.0f; + burstRadius = (radius - 8.0f)/3f; + burstRate = 1.5f; + radius = 7.99f; + patternFlags = Primitive.ParticleSystem.SourcePattern.Explode; + age = 4.0f; } SetAura(From, color, radius, burstRadius, age, burstRate, patternFlags); } @@ -111,48 +111,48 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void SetAura(SceneObjectPart From, Vector3 color, float radius, float burstRadius, float age, float burstRate, Primitive.ParticleSystem.SourcePattern patternFlags) { Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); - //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | - // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS - //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | - // Primitive.ParticleSystem.ParticleDataFlags.TargetPos; - prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR + //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | + // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS + //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | + // Primitive.ParticleSystem.ParticleDataFlags.TargetPos; + prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR prules.PartStartColor.G = color.Y; prules.PartStartColor.B = color.Z; - prules.PartStartColor.A = 0.5f; //PSYS_PART_START_ALPHA, transparency - prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR + prules.PartStartColor.A = 0.5f; //PSYS_PART_START_ALPHA, transparency + prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR prules.PartEndColor.G = color.Y; prules.PartEndColor.B = color.Z; - prules.PartEndColor.A = 0.5f; //PSYS_PART_END_ALPHA, transparency - /*prules.PartStartScaleX = 0.5f; //PSYS_PART_START_SCALE + prules.PartEndColor.A = 0.5f; //PSYS_PART_END_ALPHA, transparency + /*prules.PartStartScaleX = 0.5f; //PSYS_PART_START_SCALE prules.PartStartScaleY = 0.5f; - prules.PartEndScaleX = 0.5f; //PSYS_PART_END_SCALE + prules.PartEndScaleX = 0.5f; //PSYS_PART_END_SCALE prules.PartEndScaleY = 0.5f; */ - prules.PartStartScaleX = radius; //PSYS_PART_START_SCALE + prules.PartStartScaleX = radius; //PSYS_PART_START_SCALE prules.PartStartScaleY = radius; - prules.PartEndScaleX = radius; //PSYS_PART_END_SCALE + prules.PartEndScaleX = radius; //PSYS_PART_END_SCALE prules.PartEndScaleY = radius; - prules.PartMaxAge = age; //PSYS_PART_MAX_AGE - prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL + prules.PartMaxAge = age; //PSYS_PART_MAX_AGE + prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL prules.PartAcceleration.Y = 0.0f; prules.PartAcceleration.Z = 0.0f; - prules.Pattern = patternFlags; //PSYS_SRC_PATTERN - //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank - prules.BurstRate = burstRate; //PSYS_SRC_BURST_RATE - prules.BurstPartCount = 2; //PSYS_SRC_BURST_PART_COUNT - //prules.BurstRadius = radius; //PSYS_SRC_BURST_RADIUS - prules.BurstRadius = burstRadius; //PSYS_SRC_BURST_RADIUS - prules.BurstSpeedMin = 0.001f; //PSYS_SRC_BURST_SPEED_MIN - prules.BurstSpeedMax = 0.001f; //PSYS_SRC_BURST_SPEED_MAX - prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE - //prules.Target = To; //PSYS_SRC_TARGET_KEY - prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA + prules.Pattern = patternFlags; //PSYS_SRC_PATTERN + //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank + prules.BurstRate = burstRate; //PSYS_SRC_BURST_RATE + prules.BurstPartCount = 2; //PSYS_SRC_BURST_PART_COUNT + //prules.BurstRadius = radius; //PSYS_SRC_BURST_RADIUS + prules.BurstRadius = burstRadius; //PSYS_SRC_BURST_RADIUS + prules.BurstSpeedMin = 0.001f; //PSYS_SRC_BURST_SPEED_MIN + prules.BurstSpeedMax = 0.001f; //PSYS_SRC_BURST_SPEED_MAX + prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE + //prules.Target = To; //PSYS_SRC_TARGET_KEY + prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA prules.AngularVelocity.Y = 0.0f; prules.AngularVelocity.Z = 0.0f; - prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN - prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END + prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN + prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END - prules.CRC = 1; //activates the particle system?? + prules.CRC = 1; //activates the particle system?? From.AddNewParticleSystem(prules); } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs index 301de56..ca20ee6 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs @@ -79,15 +79,15 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement Vector3 FromPos = From.GetWorldPosition(); Vector3 ToPos = From.GetWorldPosition(); // UUID toUUID = To.UUID; - float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + - Math.Pow(FromPos.X-ToPos.Y, 2) + + float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + + Math.Pow(FromPos.X-ToPos.Y, 2) + Math.Pow(FromPos.X-ToPos.Z, 2) ) ); //float rate = (float) (distance/4f); float rate = 0.5f; float scale = (float) (distance/128f); - float speed = (float) (2.0f - distance/128f); + float speed = (float) (2.0f - distance/128f); SetBeamToUUID(From, To, color, rate, scale, speed); } @@ -95,42 +95,42 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void SetBeamToUUID(SceneObjectPart From, SceneObjectPart To, Vector3 color, float rate, float scale, float speed) { Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); - //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | - // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS - prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | - Primitive.ParticleSystem.ParticleDataFlags.TargetPos; - prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR + //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | + // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS + prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | + Primitive.ParticleSystem.ParticleDataFlags.TargetPos; + prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR prules.PartStartColor.G = color.Y; prules.PartStartColor.B = color.Z; - prules.PartStartColor.A = 1.0f; //PSYS_PART_START_ALPHA, transparency - prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR + prules.PartStartColor.A = 1.0f; //PSYS_PART_START_ALPHA, transparency + prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR prules.PartEndColor.G = color.Y; prules.PartEndColor.B = color.Z; - prules.PartEndColor.A = 1.0f; //PSYS_PART_END_ALPHA, transparency - prules.PartStartScaleX = scale; //PSYS_PART_START_SCALE + prules.PartEndColor.A = 1.0f; //PSYS_PART_END_ALPHA, transparency + prules.PartStartScaleX = scale; //PSYS_PART_START_SCALE prules.PartStartScaleY = scale; - prules.PartEndScaleX = scale; //PSYS_PART_END_SCALE + prules.PartEndScaleX = scale; //PSYS_PART_END_SCALE prules.PartEndScaleY = scale; - prules.PartMaxAge = 1.0f; //PSYS_PART_MAX_AGE - prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL + prules.PartMaxAge = 1.0f; //PSYS_PART_MAX_AGE + prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL prules.PartAcceleration.Y = 0.0f; prules.PartAcceleration.Z = 0.0f; - //prules.Pattern = Primitive.ParticleSystem.SourcePattern.Explode; //PSYS_SRC_PATTERN - //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank - prules.BurstRate = rate; //PSYS_SRC_BURST_RATE - prules.BurstPartCount = 1; //PSYS_SRC_BURST_PART_COUNT - prules.BurstRadius = 0.5f; //PSYS_SRC_BURST_RADIUS - prules.BurstSpeedMin = speed; //PSYS_SRC_BURST_SPEED_MIN - prules.BurstSpeedMax = speed; //PSYS_SRC_BURST_SPEED_MAX - prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE - prules.Target = To.UUID; //PSYS_SRC_TARGET_KEY - prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA + //prules.Pattern = Primitive.ParticleSystem.SourcePattern.Explode; //PSYS_SRC_PATTERN + //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank + prules.BurstRate = rate; //PSYS_SRC_BURST_RATE + prules.BurstPartCount = 1; //PSYS_SRC_BURST_PART_COUNT + prules.BurstRadius = 0.5f; //PSYS_SRC_BURST_RADIUS + prules.BurstSpeedMin = speed; //PSYS_SRC_BURST_SPEED_MIN + prules.BurstSpeedMax = speed; //PSYS_SRC_BURST_SPEED_MAX + prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE + prules.Target = To.UUID; //PSYS_SRC_TARGET_KEY + prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA prules.AngularVelocity.Y = 0.0f; prules.AngularVelocity.Z = 0.0f; - prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN - prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END + prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN + prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END - prules.CRC = 1; //activates the particle system?? + prules.CRC = 1; //activates the particle system?? From.AddNewParticleSystem(prules); } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs index 072de5e..cdd4f4e 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs @@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement CMModel m_model = null; /// - /// A list of all the scenes that should be revisioned. Controller is the only class that keeps track of all scenes in the region. + /// A list of all the scenes that should be revisioned. Controller is the only class that keeps track of all scenes in the region. /// Hashtable m_sceneList = Hashtable.Synchronized(new Hashtable()); State m_state = State.NONE; @@ -129,31 +129,31 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// private SceneObjectGroup GetGroupByPrim(uint localID) { - foreach(Object currScene in m_sceneList.Values) + foreach (Object currScene in m_sceneList.Values) { - foreach (EntityBase ent in ((Scene)currScene).GetEntities()) - { - if (ent is SceneObjectGroup) - { - if (((SceneObjectGroup)ent).HasChildPrim(localID)) - return (SceneObjectGroup)ent; - } - } + foreach (EntityBase ent in ((Scene)currScene).GetEntities()) + { + if (ent is SceneObjectGroup) + { + if (((SceneObjectGroup)ent).HasChildPrim(localID)) + return (SceneObjectGroup)ent; + } + } } return null; } private void Initialize(CMModel model, CMView view, Scene scene, int channel) { - lock(this) + lock (this) { - m_estateModule = scene.RequestModuleInterface(); - m_thread = new Thread( MainLoop ); - m_thread.Name = "Content Management"; - m_thread.IsBackground = true; - m_thread.Start(); - ThreadTracker.Add(m_thread); - m_state = State.NONE; + m_estateModule = scene.RequestModuleInterface(); + m_thread = new Thread(MainLoop); + m_thread.Name = "Content Management"; + m_thread.IsBackground = true; + m_thread.Start(); + ThreadTracker.Add(m_thread); + m_state = State.NONE; } } @@ -164,41 +164,41 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { CMModel model = m_model; CMView view = m_view; int channel = m_channel; Work currentJob = new Work(); - while(true) + while (true) { - currentJob = m_WorkQueue.Dequeue(); - m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- DeQueued a request"); - m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Work type: " + currentJob.Type); - switch(currentJob.Type) - { - case WorkType.NONE: - break; - case WorkType.OBJECTATTRIBUTECHANGE: - ObjectAttributeChanged(model, view, currentJob.LocalId); - break; - case WorkType.PRIMITIVEADDED: - PrimitiveAdded(model, view, currentJob); - break; - case WorkType.OBJECTDUPLICATED: - ObjectDuplicated(model, view, currentJob.LocalId); - break; - case WorkType.OBJECTKILLED: - ObjectKilled(model, view, (SceneObjectGroup) currentJob.Data1); - break; - case WorkType.UNDODID: - UndoDid(model, view, currentJob.UUID); - break; - case WorkType.NEWCLIENT: - NewClient(view, (IClientAPI) currentJob.Data1); - break; - case WorkType.SIMCHAT: - m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((OSChatMessage) currentJob.Data1).Message); - SimChat(model, view, (OSChatMessage) currentJob.Data1, channel); - break; - default: - m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?"); - break; - } + currentJob = m_WorkQueue.Dequeue(); + m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- DeQueued a request"); + m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Work type: " + currentJob.Type); + switch (currentJob.Type) + { + case WorkType.NONE: + break; + case WorkType.OBJECTATTRIBUTECHANGE: + ObjectAttributeChanged(model, view, currentJob.LocalId); + break; + case WorkType.PRIMITIVEADDED: + PrimitiveAdded(model, view, currentJob); + break; + case WorkType.OBJECTDUPLICATED: + ObjectDuplicated(model, view, currentJob.LocalId); + break; + case WorkType.OBJECTKILLED: + ObjectKilled(model, view, (SceneObjectGroup) currentJob.Data1); + break; + case WorkType.UNDODID: + UndoDid(model, view, currentJob.UUID); + break; + case WorkType.NEWCLIENT: + NewClient(view, (IClientAPI) currentJob.Data1); + break; + case WorkType.SIMCHAT: + m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((OSChatMessage) currentJob.Data1).Message); + SimChat(model, view, (OSChatMessage) currentJob.Data1, channel); + break; + default: + m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?"); + break; + } } } @@ -207,24 +207,24 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// private void NewClient(CMView view, IClientAPI client) { - if ((m_state & State.SHOWING_CHANGES) > 0) - view.SendMetaEntitiesToNewClient(client); + if ((m_state & State.SHOWING_CHANGES) > 0) + view.SendMetaEntitiesToNewClient(client); } /// - /// Only called by the MainLoop. + /// Only called by the MainLoop. /// private void ObjectAttributeChanged(CMModel model, CMView view, uint LocalId) { SceneObjectGroup group = null; - if ((m_state & State.SHOWING_CHANGES) > 0) + if ((m_state & State.SHOWING_CHANGES) > 0) { - group = GetGroupByPrim(LocalId); - if (group != null) - { - view.DisplayAuras( model.UpdateNormalEntityEffects(group) ); //Might be a normal entity (green aura) - m_view.DisplayMetaEntity(group.UUID); //Might be a meta entity (blue aura) - } + group = GetGroupByPrim(LocalId); + if (group != null) + { + view.DisplayAuras(model.UpdateNormalEntityEffects(group)); //Might be a normal entity (green aura) + m_view.DisplayMetaEntity(group.UUID); //Might be a meta entity (blue aura) + } } } @@ -234,43 +234,43 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement private void ObjectDuplicated(CMModel model, CMView view, uint localId) { if ((m_state & State.SHOWING_CHANGES) > 0) - view.DisplayAuras(model.CheckForNewEntitiesMissingAuras( GetGroupByPrim(localId).Scene )); + view.DisplayAuras(model.CheckForNewEntitiesMissingAuras(GetGroupByPrim(localId).Scene)); } /// - /// Only called by the MainLoop. - /// + /// Only called by the MainLoop. + /// private void ObjectKilled(CMModel model, CMView view, SceneObjectGroup group) { - if ((m_state & State.SHOWING_CHANGES) > 0) + if ((m_state & State.SHOWING_CHANGES) > 0) { - view.RemoveOrUpdateDeletedEntity(group); - model.RemoveOrUpdateDeletedEntity(group); + view.RemoveOrUpdateDeletedEntity(group); + model.RemoveOrUpdateDeletedEntity(group); } } /// - /// Only called by the MainLoop. + /// Only called by the MainLoop. /// private void PrimitiveAdded(CMModel model, CMView view, Work currentJob) { - if ((m_state & State.SHOWING_CHANGES) > 0) + if ((m_state & State.SHOWING_CHANGES) > 0) { - foreach(Object scene in m_sceneList.Values) - m_view.DisplayAuras(model.CheckForNewEntitiesMissingAuras((Scene) scene)); + foreach (Object scene in m_sceneList.Values) + m_view.DisplayAuras(model.CheckForNewEntitiesMissingAuras((Scene) scene)); } } /// - /// Only called by the MainLoop. + /// Only called by the MainLoop. /// private void UndoDid(CMModel model, CMView view, UUID uuid) { - if ((m_state & State.SHOWING_CHANGES) > 0) + if ((m_state & State.SHOWING_CHANGES) > 0) { - ContentManagementEntity ent = model.FindMetaEntityAffectedByUndo(uuid); - if (ent != null) - view.DisplayEntity(ent); + ContentManagementEntity ent = model.FindMetaEntityAffectedByUndo(uuid); + if (ent != null) + view.DisplayEntity(ent); } } @@ -328,38 +328,38 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// /// Takes a list of scenes and forms a new orderd list according to the proximity of scenes to the second argument. /// - protected static System.Collections.Generic.List ScenesInOrderOfProximity( Hashtable sceneList, Scene scene) + protected static System.Collections.Generic.List ScenesInOrderOfProximity(Hashtable sceneList, Scene scene) { int somethingAddedToList = 1; System.Collections.Generic.List newList = new List(); newList.Add(scene); - if (! sceneList.ContainsValue(scene)) + if (!sceneList.ContainsValue(scene)) { - foreach(Object sceneObj in sceneList) - newList.Add((Scene) sceneObj); - return newList; + foreach (Object sceneObj in sceneList) + newList.Add((Scene) sceneObj); + return newList; } - while(somethingAddedToList > 0) + while (somethingAddedToList > 0) { - somethingAddedToList = 0; - for(int i = 0; i < newList.Count; i++) - { - foreach(Object sceneObj in sceneList.Values) - { - if (newList[i].CheckNeighborRegion(((Scene)sceneObj).RegionInfo) && (! newList.Contains((Scene)sceneObj)) ) - { - newList.Add((Scene)sceneObj); - somethingAddedToList++; - } - } - } + somethingAddedToList = 0; + for (int i = 0; i < newList.Count; i++) + { + foreach (Object sceneObj in sceneList.Values) + { + if (newList[i].CheckNeighborRegion(((Scene)sceneObj).RegionInfo) && (!newList.Contains((Scene)sceneObj))) + { + newList.Add((Scene)sceneObj); + somethingAddedToList++; + } + } + } } - foreach(Object sceneObj in sceneList.Values) - if (! newList.Contains((Scene)sceneObj)) - newList.Add((Scene)sceneObj); + foreach (Object sceneObj in sceneList.Values) + if (!newList.Contains((Scene)sceneObj)) + newList.Add((Scene)sceneObj); return newList; } @@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement protected void StartManaging(IClientAPI client) { m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services."); - client.OnChatFromViewer += SimChatSent; + client.OnChatFromViewer += SimChatSent; //init = true; OnNewClient(client); @@ -401,19 +401,19 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement } /// - /// + /// /// protected void StopManaging(UUID clientUUID) { - foreach(Object sceneobj in m_sceneList.Values) + foreach (Object sceneobj in m_sceneList.Values) { - ScenePresence presence = ((Scene)sceneobj).GetScenePresence(clientUUID); + ScenePresence presence = ((Scene)sceneobj).GetScenePresence(clientUUID); if (presence != null) { IClientAPI client = presence.ControllingClient; m_log.Debug("[CONTENT MANAGEMENT] Unregistering channel with chat services."); - client.OnChatFromViewer -= SimChatSent; - + client.OnChatFromViewer -= SimChatSent; + m_log.Debug("[CONTENT MANAGEMENT] Removing handlers to client"); client.OnUpdatePrimScale -= UpdateSingleScale; client.OnUpdatePrimGroupScale -= UpdateMultipleScale; @@ -427,10 +427,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement client.OnUndo -= OnUnDid; //client.OnUpdatePrimGroupMouseRotation += m_innerScene.UpdatePrimRotation; return; - } + } } } - + protected void UpdateMultiplePosition(uint localID, Vector3 pos, IClientAPI remoteClient) { Work moreWork = new Work(); @@ -479,7 +479,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement } /// - /// + /// /// protected void UpdateSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient) { @@ -504,47 +504,47 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// protected void commit(string message, Scene scene, CMModel model, CMView view) { - System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity( m_sceneList, scene); + System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity(m_sceneList, scene); string[] args = message.Split(new char[] {' '}); char[] logMessage = {' '}; - if (args.Length > 1) + if (args.Length > 1) { - logMessage = new char[message.Length - (args[0].Length)]; - message.CopyTo(args[0].Length, logMessage, 0, message.Length - (args[0].Length)); - } + logMessage = new char[message.Length - (args[0].Length)]; + message.CopyTo(args[0].Length, logMessage, 0, message.Length - (args[0].Length)); + } m_log.Debug("[CONTENT MANAGEMENT] Saving terrain and objects of region."); - foreach(Scene currScene in proximitySceneList) + foreach (Scene currScene in proximitySceneList) { - model.CommitRegion(currScene, new String(logMessage)); - view.SendSimChatMessage(scene, "Region Saved Successfully: " + currScene.RegionInfo.RegionName); + model.CommitRegion(currScene, new String(logMessage)); + view.SendSimChatMessage(scene, "Region Saved Successfully: " + currScene.RegionInfo.RegionName); } view.SendSimChatMessage(scene, "Successfully saved all regions."); m_state |= State.DIRTY; if ((m_state & State.SHOWING_CHANGES) > 0) //DISPLAY NEW CHANGES INSTEAD OF OLD CHANGES - { - view.SendSimChatMessage(scene, "Updating differences between new revision and current environment."); - //Hide objects from users and Forget about them - view.HideAllMetaEntities(); - view.HideAllAuras(); - model.DeleteAllMetaObjects(); - - //Recreate them from backend files - foreach(Scene currScene in proximitySceneList) - { - model.UpdateCMEntities(currScene); - view.SendSimChatMessage(scene, "Finished updating differences between current scene and last revision: " + currScene.RegionInfo.RegionName); - } - - //Display new objects to users1 - view.DisplayRecentChanges(); - view.SendSimChatMessage(scene, "Finished updating for DIFF-MODE."); - m_state &= ~(State.DIRTY); - m_state |= State.SHOWING_CHANGES; + { + view.SendSimChatMessage(scene, "Updating differences between new revision and current environment."); + //Hide objects from users and Forget about them + view.HideAllMetaEntities(); + view.HideAllAuras(); + model.DeleteAllMetaObjects(); + + //Recreate them from backend files + foreach (Scene currScene in proximitySceneList) + { + model.UpdateCMEntities(currScene); + view.SendSimChatMessage(scene, "Finished updating differences between current scene and last revision: " + currScene.RegionInfo.RegionName); + } + + //Display new objects to users1 + view.DisplayRecentChanges(); + view.SendSimChatMessage(scene, "Finished updating for DIFF-MODE."); + m_state &= ~(State.DIRTY); + m_state |= State.SHOWING_CHANGES; } } @@ -553,74 +553,74 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// protected void diffmode(Scene scene, CMModel model, CMView view) { - System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity( m_sceneList, scene); + System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity(m_sceneList, scene); if ((m_state & State.SHOWING_CHANGES) > 0) // TURN OFF { - view.SendSimChatMessage(scene, "Hiding all meta objects."); - view.HideAllMetaEntities(); - view.HideAllAuras(); - view.SendSimChatMessage(scene, "Diff-mode = OFF"); - - m_state &= ~State.SHOWING_CHANGES; - return; + view.SendSimChatMessage(scene, "Hiding all meta objects."); + view.HideAllMetaEntities(); + view.HideAllAuras(); + view.SendSimChatMessage(scene, "Diff-mode = OFF"); + + m_state &= ~State.SHOWING_CHANGES; + return; } else // TURN ON { - if ((m_state & State.DIRTY) != 0 || m_state == State.NONE) - { - view.SendSimChatMessage(scene, "Hiding meta objects and replacing with latest revision"); - //Hide objects from users and Forget about them - view.HideAllMetaEntities(); - view.HideAllAuras(); - model.DeleteAllMetaObjects(); - //Recreate them from backend files - foreach(Object currScene in m_sceneList.Values) - model.UpdateCMEntities((Scene) currScene); - } - else if ((m_state & State.DIRTY) != 0) { - view.SendSimChatMessage(scene, "Forming list of meta entities with latest revision"); - foreach(Scene currScene in proximitySceneList) - model.UpdateCMEntities(currScene); - } - - view.SendSimChatMessage(scene, "Displaying differences between last revision and current environment"); - foreach(Scene currScene in proximitySceneList) - model.CheckForNewEntitiesMissingAuras(currScene); - view.DisplayRecentChanges(); - - view.SendSimChatMessage(scene, "Diff-mode = ON"); - m_state |= State.SHOWING_CHANGES; - m_state &= ~State.DIRTY; + if ((m_state & State.DIRTY) != 0 || m_state == State.NONE) + { + view.SendSimChatMessage(scene, "Hiding meta objects and replacing with latest revision"); + //Hide objects from users and Forget about them + view.HideAllMetaEntities(); + view.HideAllAuras(); + model.DeleteAllMetaObjects(); + //Recreate them from backend files + foreach (Object currScene in m_sceneList.Values) + model.UpdateCMEntities((Scene) currScene); + } + else if ((m_state & State.DIRTY) != 0) { + view.SendSimChatMessage(scene, "Forming list of meta entities with latest revision"); + foreach (Scene currScene in proximitySceneList) + model.UpdateCMEntities(currScene); + } + + view.SendSimChatMessage(scene, "Displaying differences between last revision and current environment"); + foreach (Scene currScene in proximitySceneList) + model.CheckForNewEntitiesMissingAuras(currScene); + view.DisplayRecentChanges(); + + view.SendSimChatMessage(scene, "Diff-mode = ON"); + m_state |= State.SHOWING_CHANGES; + m_state &= ~State.DIRTY; } } /// - /// Only called from within the SimChat method. Hides all auras and meta entities, - /// retrieves the current scene object list with the most recent revision retrieved from the model for each scene, + /// Only called from within the SimChat method. Hides all auras and meta entities, + /// retrieves the current scene object list with the most recent revision retrieved from the model for each scene, /// then lets the view update the clients of the new objects. /// protected void rollback(Scene scene, CMModel model, CMView view) { if ((m_state & State.SHOWING_CHANGES) > 0) { - view.HideAllAuras(); - view.HideAllMetaEntities(); + view.HideAllAuras(); + view.HideAllMetaEntities(); } - System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity( m_sceneList, scene); - foreach(Scene currScene in proximitySceneList) - model.RollbackRegion(currScene); + System.Collections.Generic.List proximitySceneList = ScenesInOrderOfProximity(m_sceneList, scene); + foreach (Scene currScene in proximitySceneList) + model.RollbackRegion(currScene); - if ((m_state & State.DIRTY) != 0 ) + if ((m_state & State.DIRTY) != 0) { - model.DeleteAllMetaObjects(); - foreach(Scene currScene in proximitySceneList) - model.UpdateCMEntities(currScene); + model.DeleteAllMetaObjects(); + foreach (Scene currScene in proximitySceneList) + model.UpdateCMEntities(currScene); } if ((m_state & State.SHOWING_CHANGES) > 0) - view.DisplayRecentChanges(); + view.DisplayRecentChanges(); } #endregion Protected Methods @@ -642,7 +642,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement scene.EventManager.OnNewClient += StartManaging; scene.EventManager.OnRemovePresence += StopManaging; - // scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; + // scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; scene.EventManager.OnObjectBeingRemovedFromScene += GroupBeingDeleted; } @@ -652,9 +652,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void SimChat(CMModel model, CMView view, OSChatMessage e, int channel) { if (e.Channel != channel) - return; + return; if (e.Sender == null) - return; + return; m_log.Debug("[CONTENT MANAGEMENT] Message received: " + e.Message); @@ -667,31 +667,31 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement if (!(m_estateModule.IsManager(avatar.UUID))) { - m_log.Debug("[CONTENT MANAGEMENT] Message sent from non Estate Manager ... ignoring."); - view.SendSimChatMessage(scene, "You must be an estate manager to perform that action."); - return; + m_log.Debug("[CONTENT MANAGEMENT] Message sent from non Estate Manager ... ignoring."); + view.SendSimChatMessage(scene, "You must be an estate manager to perform that action."); + return; } - switch(args[0]) + switch (args[0]) { case "ci": case "commit": - commit(message, scene, model, view); - break; + commit(message, scene, model, view); + break; case "dm": case "diff-mode": - diffmode(scene, model, view); - break; + diffmode(scene, model, view); + break; case "rb": case "rollback": - rollback(scene, model, view); - break; + rollback(scene, model, view); + break; case "help": - m_view.DisplayHelpMenu(scene); - break; + m_view.DisplayHelpMenu(scene); + break; default: - view.SendSimChatMessage(scene, "Command not found: " + args[0]); - break; + view.SendSimChatMessage(scene, "Command not found: " + args[0]); + break; } } @@ -705,7 +705,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement [Flags] private enum State { - NONE = 0, + NONE = 0, DIRTY = 1, // The meta entities may not correctly represent the last revision. SHOWING_CHANGES = 1<<1 // The meta entities are being shown to user. } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs index 996badf..6bbc30c 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs @@ -58,8 +58,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { #region Fields - // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or + // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or // old versions of deleted SceneObjectGroups will be stored in this hash table. // The UUID keys are from the SceneObjectGroup RootPart UUIDs protected Hashtable m_CMEntityHash = Hashtable.Synchronized(new Hashtable()); //UUID to ContentManagementEntity @@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public bool AddAura(ContentManagementEntity aura) { if (m_NewlyCreatedEntityAura.ContainsKey(aura.UUID)) - return false; + return false; m_NewlyCreatedEntityAura.Add(aura.UUID, aura); return true; } @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public bool AddEntity(ContentManagementEntity ent) { if (m_CMEntityHash.ContainsKey(ent.UUID)) - return false; + return false; m_CMEntityHash.Add(ent.UUID, ent); return true; } @@ -115,23 +115,23 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { System.Collections.ArrayList missingList = new System.Collections.ArrayList(); SceneObjectGroup temp = null; - foreach( EntityBase currObj in currList ) + foreach (EntityBase currObj in currList) { - if (! (currObj is SceneObjectGroup)) - continue; - temp = (SceneObjectGroup) currObj; - - if (m_CMEntityHash.ContainsKey(temp.UUID)) - { - foreach(SceneObjectPart part in temp.Children.Values) - if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID)) - missingList.Add(part); - } - else //Entire group is missing from revision. (and is a new part in region) - { - foreach(SceneObjectPart part in temp.Children.Values) - missingList.Add(part); - } + if (!(currObj is SceneObjectGroup)) + continue; + temp = (SceneObjectGroup) currObj; + + if (m_CMEntityHash.ContainsKey(temp.UUID)) + { + foreach (SceneObjectPart part in temp.Children.Values) + if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID)) + missingList.Add(part); + } + else //Entire group is missing from revision. (and is a new part in region) + { + foreach (SceneObjectPart part in temp.Children.Values) + missingList.Add(part); + } } return missingList; } @@ -146,9 +146,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part) { AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene, - part.ParentGroup.Scene.PrimIDAllocate(), - part.GetWorldPosition(), - MetaEntity.TRANSLUCENT, + part.ParentGroup.Scene.PrimIDAllocate(), + part.GetWorldPosition(), + MetaEntity.TRANSLUCENT, new Vector3(0,254,0), part.Scale ); @@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { ContentManagementEntity ent = new ContentManagementEntity(xml, scene, false); if (ent == null) - return null; + return null; m_CMEntityHash.Add(ent.UnchangedEntity.UUID, ent); return ent; } @@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public bool RemoveEntity(UUID uuid) { if (!m_CMEntityHash.ContainsKey(uuid)) - return false; + return false; m_CMEntityHash.Remove(uuid); return true; } @@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public bool RemoveNewlyCreatedEntityAura(UUID uuid) { if (!m_NewlyCreatedEntityAura.ContainsKey(uuid)) - return false; + return false; m_NewlyCreatedEntityAura.Remove(uuid); return true; } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs index e1b4129..1a41c7b 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs @@ -27,8 +27,8 @@ #region Header -// CMModel.cs -// User: bongiojp +// CMModel.cs +// User: bongiojp // // @@ -100,13 +100,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement ArrayList missingList = null; ArrayList newList = new ArrayList(); - m_log.Debug("[CONTENT MANAGEMENT] Checking for new scene object parts in scene: " + scene.RegionInfo.RegionName); + m_log.Debug("[CONTENT MANAGEMENT] Checking for new scene object parts in scene: " + scene.RegionInfo.RegionName); //Check if the current scene has groups not included in the current list of MetaEntities - //If so, then the current scene's parts that are new should be marked green. + //If so, then the current scene's parts that are new should be marked green. missingList = m_MetaEntityCollection.CheckForMissingEntities(scene.GetEntities()); - foreach(Object missingPart in missingList) + foreach (Object missingPart in missingList) { if (m_MetaEntityCollection.Auras.ContainsKey(((SceneObjectPart)missingPart).UUID)) continue; @@ -175,16 +175,16 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void RemoveOrUpdateDeletedEntity(SceneObjectGroup group) { // Deal with new parts not revisioned that have been deleted. - foreach(SceneObjectPart part in group.Children.Values) + foreach (SceneObjectPart part in group.Children.Values) if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID)) m_MetaEntityCollection.RemoveNewlyCreatedEntityAura(part.UUID); } /// - /// Retrieves the latest revision of a region in xml form, - /// converts it to scene object groups and scene presences, + /// Retrieves the latest revision of a region in xml form, + /// converts it to scene object groups and scene presences, /// swaps the current scene's entity list with the revision's list. - /// Note: Since deleted objects while + /// Note: Since deleted objects while /// public void RollbackRegion(Scene scene) { @@ -214,26 +214,26 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement try{ temp = new SceneObjectGroup(xml); temp.SetScene(scene); - foreach(SceneObjectPart part in temp.Children.Values) + foreach (SceneObjectPart part in temp.Children.Values) part.RegionHandle = scene.RegionInfo.RegionHandle; ReplacementList.Add(temp.UUID, (EntityBase)temp); - } + } catch(Exception e) { m_log.Info("[CMMODEL]: Error while creating replacement list for rollback: " + e); - } + } } //If in scene but not in revision and not a client, remove them while (true) { - try + try { - foreach(EntityBase entity in scene.GetEntities()) + foreach (EntityBase entity in scene.GetEntities()) { if (entity == null) continue; - + if (entity is ScenePresence) { ReplacementList.Add(entity.UUID, entity); @@ -253,9 +253,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement break; } - foreach(UUID uuid in deleteListUUIDs.Keys) + foreach (UUID uuid in deleteListUUIDs.Keys) { - try + try { // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup((SceneObjectGroup)scene.Entities[uuid]); @@ -275,13 +275,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement scene.Entities = ReplacementList; } - foreach(EntityBase ent in ReplacementList.Values) + foreach (EntityBase ent in ReplacementList.Values) { try - { + { if (!(ent is SceneObjectGroup)) continue; - + if ((((SceneObjectGroup)ent).RootPart.GetEffectiveObjectFlags() & (uint) PrimFlags.Phantom) == 0) ((SceneObjectGroup)ent).ApplyPhysics(true); ((SceneObjectGroup)ent).AttachToBackup(); @@ -319,15 +319,15 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_MetaEntityCollection.CreateNewEntity(xml, scene); y.Stop(); TimeToConvertXml += y.ElapsedMilliseconds; - m_log.Info("[FileSystemDatabase] Time spent converting xml to metaentities for " + scene.RegionInfo.RegionName + ": " + y.ElapsedMilliseconds); - m_log.Info("[FileSystemDatabase] Time spent converting xml to metaentities so far: " + TimeToConvertXml); + m_log.Info("[FileSystemDatabase] Time spent converting xml to metaentities for " + scene.RegionInfo.RegionName + ": " + y.ElapsedMilliseconds); + m_log.Info("[FileSystemDatabase] Time spent converting xml to metaentities so far: " + TimeToConvertXml); m_log.Info("[FSDB]: checking for new scene object parts missing green auras and create the auras"); CheckForNewEntitiesMissingAuras(scene); x.Stop(); TimeToUpdate += x.ElapsedMilliseconds; - m_log.Info("[FileSystemDatabase] Time spent Updating entity list for " + scene.RegionInfo.RegionName + ": " + x.ElapsedMilliseconds); + m_log.Info("[FileSystemDatabase] Time spent Updating entity list for " + scene.RegionInfo.RegionName + ": " + x.ElapsedMilliseconds); m_log.Info("[FileSystemDatabase] Time spent Updating so far: " + TimeToUpdate); } @@ -340,7 +340,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement System.Collections.ArrayList auraList = new System.Collections.ArrayList(); if (group == null) return null; - foreach(SceneObjectPart part in group.Children.Values) + foreach (SceneObjectPart part in group.Children.Values) { if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID)) { diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs index 90ef6ef..88f4a67 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs @@ -78,46 +78,46 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement // Auras To public void DisplayAuras(CMEntityCollection auraCollection) { - foreach( Object ent in auraCollection.Auras.Values) - ((AuraMetaEntity)ent).SendFullUpdateToAll(); + foreach (Object ent in auraCollection.Auras.Values) + ((AuraMetaEntity)ent).SendFullUpdateToAll(); } // Auras To Client public void DisplayAuras(CMEntityCollection auraCollection, IClientAPI client) { - foreach( Object ent in auraCollection.Auras.Values) - ((AuraMetaEntity)ent).SendFullUpdate(client); + foreach (Object ent in auraCollection.Auras.Values) + ((AuraMetaEntity)ent).SendFullUpdate(client); } // Auras from List To ALL public void DisplayAuras(ArrayList list) { - foreach( Object ent in list) + foreach (Object ent in list) { - m_log.Debug("[CONTENT MANAGEMENT] displaying new aura riiiiiiiiiiiight NOW"); - ((AuraMetaEntity)ent).SendFullUpdateToAll(); + m_log.Debug("[CONTENT MANAGEMENT] displaying new aura riiiiiiiiiiiight NOW"); + ((AuraMetaEntity)ent).SendFullUpdateToAll(); } } // Entities to ALL public void DisplayEntities(CMEntityCollection entityCollection) { - foreach( Object ent in entityCollection.Entities.Values) - ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); + foreach (Object ent in entityCollection.Entities.Values) + ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); } // Entities to Client public void DisplayEntities(CMEntityCollection entityCollection, IClientAPI client) { - foreach( Object ent in entityCollection.Entities.Values) - ((ContentManagementEntity)ent).SendFullDiffUpdate(client); + foreach (Object ent in entityCollection.Entities.Values) + ((ContentManagementEntity)ent).SendFullDiffUpdate(client); } // Entities from List to ALL public void DisplayEntities(ArrayList list) { - foreach( Object ent in list) - ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); + foreach (Object ent in list) + ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); } // Entity to ALL @@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { ContentManagementEntity group = m_model.GetMetaGroupByPrim(uuid); if (group != null) - group.SendFullDiffUpdateToAll(); + group.SendFullDiffUpdateToAll(); } /// @@ -158,14 +158,14 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void HideAllAuras() { - foreach(Object obj in m_model.MetaEntityCollection.Auras.Values) - ((MetaEntity)obj).HideFromAll(); + foreach (Object obj in m_model.MetaEntityCollection.Auras.Values) + ((MetaEntity)obj).HideFromAll(); } public void HideAllMetaEntities() { - foreach(Object obj in m_model.MetaEntityCollection.Entities.Values) - ((ContentManagementEntity)obj).HideFromAll(); + foreach (Object obj in m_model.MetaEntityCollection.Entities.Values) + ((ContentManagementEntity)obj).HideFromAll(); } public void Initialise(CMModel model) @@ -183,12 +183,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { // Deal with revisioned parts that have been deleted. if (m_model.MetaEntityCollection.Entities.ContainsKey(group.UUID)) - ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll(); + ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll(); // Deal with new parts not revisioned that have been deleted. - foreach(SceneObjectPart part in group.Children.Values) - if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID)) - ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll(); + foreach (SceneObjectPart part in group.Children.Values) + if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID)) + ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll(); } public void SendMetaEntitiesToNewClient(IClientAPI client) diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs index 819ff87..13f5cc0 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs @@ -104,13 +104,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement #region Private Methods /// - /// Check if an entitybase list (like that returned by scene.GetEntities() ) contains a group with the rootpart uuid that matches the current uuid. + /// Check if an entitybase list (like that returned by scene.GetEntities()) contains a group with the rootpart uuid that matches the current uuid. /// private bool ContainsKey(List list, UUID uuid) { - foreach( EntityBase part in list) - if (part.UUID == uuid) - return true; + foreach (EntityBase part in list) + if (part.UUID == uuid) + return true; return false; } @@ -118,9 +118,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { foreach (EntityBase ent in list) { - if (ent is SceneObjectGroup) - if (ent.UUID == uuid) - return (SceneObjectGroup)ent; + if (ent is SceneObjectGroup) + if (ent.UUID == uuid) + return (SceneObjectGroup)ent; } return null; } @@ -138,49 +138,49 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement System.Collections.Generic.List sceneEntityList = m_Entity.Scene.GetEntities(); DiffersFromSceneGroup = false; // if group is not contained in scene's list - if(!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID)) + if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID)) { - foreach(SceneObjectPart part in m_UnchangedEntity.Children.Values) - { - // if scene list no longer contains this part, display translucent part and mark with red aura - if(! ContainsKey(sceneEntityList, part.UUID)) - { - // if already displaying a red aura over part, make sure its red - if (m_AuraEntities.ContainsKey(part.UUID)) - { - m_AuraEntities[part.UUID].SetAura(new Vector3(254,0,0), part.Scale); - } - else - { - AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, - m_Entity.Scene.PrimIDAllocate(), - part.GetWorldPosition(), - MetaEntity.TRANSLUCENT, - new Vector3(254,0,0), - part.Scale - ); - m_AuraEntities.Add(part.UUID, auraGroup); - } - SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum); - SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT); - } - // otherwise, scene will not contain the part. note: a group can not remove a part without changing group id - } - - // a deleted part has no where to point a beam particle system, - // if a metapart had a particle system (maybe it represented a moved part) remove it - if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) - { - m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); - m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); - } - - DiffersFromSceneGroup = true; + foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values) + { + // if scene list no longer contains this part, display translucent part and mark with red aura + if (!ContainsKey(sceneEntityList, part.UUID)) + { + // if already displaying a red aura over part, make sure its red + if (m_AuraEntities.ContainsKey(part.UUID)) + { + m_AuraEntities[part.UUID].SetAura(new Vector3(254,0,0), part.Scale); + } + else + { + AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, + m_Entity.Scene.PrimIDAllocate(), + part.GetWorldPosition(), + MetaEntity.TRANSLUCENT, + new Vector3(254,0,0), + part.Scale + ); + m_AuraEntities.Add(part.UUID, auraGroup); + } + SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum); + SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT); + } + // otherwise, scene will not contain the part. note: a group can not remove a part without changing group id + } + + // a deleted part has no where to point a beam particle system, + // if a metapart had a particle system (maybe it represented a moved part) remove it + if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) + { + m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); + m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); + } + + DiffersFromSceneGroup = true; } // if scene list does contain group, compare each part in group for differences and display beams and auras appropriately - else + else { - MarkWithDifferences((SceneObjectGroup)GetGroupByUUID(sceneEntityList, m_UnchangedEntity.UUID)); + MarkWithDifferences((SceneObjectGroup)GetGroupByUUID(sceneEntityList, m_UnchangedEntity.UUID)); } } @@ -190,7 +190,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public bool HasChildPrim(UUID uuid) { if (m_UnchangedEntity.Children.ContainsKey(uuid)) - return true; + return true; return false; } @@ -199,28 +199,28 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// public bool HasChildPrim(uint localID) { - foreach( SceneObjectPart part in m_UnchangedEntity.Children.Values) - if ( part.LocalId == localID ) - return true; + foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values) + if (part.LocalId == localID) + return true; return false; } public override void Hide(IClientAPI client) { base.Hide(client); - foreach(MetaEntity group in m_AuraEntities.Values) - group.Hide(client); - foreach(MetaEntity group in m_BeamEntities.Values) - group.Hide(client); + foreach (MetaEntity group in m_AuraEntities.Values) + group.Hide(client); + foreach (MetaEntity group in m_BeamEntities.Values) + group.Hide(client); } public override void HideFromAll() { base.HideFromAll(); - foreach(MetaEntity group in m_AuraEntities.Values) - group.HideFromAll(); - foreach(MetaEntity group in m_BeamEntities.Values) - group.HideFromAll(); + foreach (MetaEntity group in m_AuraEntities.Values) + group.HideFromAll(); + foreach (MetaEntity group in m_BeamEntities.Values) + group.HideFromAll(); } /// @@ -234,92 +234,92 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement Diff differences; bool changed = false; - // Use "UnchangedEntity" to do comparisons because its text, transparency, and other attributes will be just as the user + // Use "UnchangedEntity" to do comparisons because its text, transparency, and other attributes will be just as the user // had originally saved. // m_Entity will NOT necessarily be the same entity as the user had saved. - foreach(SceneObjectPart UnchangedPart in m_UnchangedEntity.Children.Values) + foreach (SceneObjectPart UnchangedPart in m_UnchangedEntity.Children.Values) { - //This is the part that we use to show changes. - metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum); - if (sceneEntityGroup.Children.ContainsKey(UnchangedPart.UUID)) - { - sceneEntityPart = sceneEntityGroup.Children[UnchangedPart.UUID]; - differences = Difference.FindDifferences(UnchangedPart, sceneEntityPart); - if (differences != Diff.NONE) - metaEntityPart.Text = "CHANGE: " + differences.ToString(); - if (differences != 0) - { - // Root Part that has been modified - if ((differences&Diff.POSITION) > 0) - { - // If the position of any part has changed, make sure the RootPart of the - // meta entity is pointing with a beam particle system - if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) - { - m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); - m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); - } - BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene, - m_Entity.Scene.PrimIDAllocate(), - m_UnchangedEntity.RootPart.GetWorldPosition(), - MetaEntity.TRANSLUCENT, - sceneEntityPart, - new Vector3(0,0,254) - ); - m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup); - } - - if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) - { - m_AuraEntities[UnchangedPart.UUID].HideFromAll(); - m_AuraEntities.Remove(UnchangedPart.UUID); - } - AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, - m_Entity.Scene.PrimIDAllocate(), - UnchangedPart.GetWorldPosition(), - MetaEntity.TRANSLUCENT, - new Vector3(0,0,254), - UnchangedPart.Scale - ); - m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); - SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); - - DiffersFromSceneGroup = true; - } - else // no differences between scene part and meta part - { - if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) - { - m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); - m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); - } - if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) - { - m_AuraEntities[UnchangedPart.UUID].HideFromAll(); - m_AuraEntities.Remove(UnchangedPart.UUID); - } - SetPartTransparency(metaEntityPart, MetaEntity.NONE); - } - } - else //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted. - { - if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) - { - m_AuraEntities[UnchangedPart.UUID].HideFromAll(); - m_AuraEntities.Remove(UnchangedPart.UUID); - } - AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, - m_Entity.Scene.PrimIDAllocate(), - UnchangedPart.GetWorldPosition(), - MetaEntity.TRANSLUCENT, - new Vector3(254,0,0), - UnchangedPart.Scale - ); - m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); - SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); - - DiffersFromSceneGroup = true; - } + //This is the part that we use to show changes. + metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum); + if (sceneEntityGroup.Children.ContainsKey(UnchangedPart.UUID)) + { + sceneEntityPart = sceneEntityGroup.Children[UnchangedPart.UUID]; + differences = Difference.FindDifferences(UnchangedPart, sceneEntityPart); + if (differences != Diff.NONE) + metaEntityPart.Text = "CHANGE: " + differences.ToString(); + if (differences != 0) + { + // Root Part that has been modified + if ((differences&Diff.POSITION) > 0) + { + // If the position of any part has changed, make sure the RootPart of the + // meta entity is pointing with a beam particle system + if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) + { + m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); + m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); + } + BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene, + m_Entity.Scene.PrimIDAllocate(), + m_UnchangedEntity.RootPart.GetWorldPosition(), + MetaEntity.TRANSLUCENT, + sceneEntityPart, + new Vector3(0,0,254) + ); + m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup); + } + + if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) + { + m_AuraEntities[UnchangedPart.UUID].HideFromAll(); + m_AuraEntities.Remove(UnchangedPart.UUID); + } + AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, + m_Entity.Scene.PrimIDAllocate(), + UnchangedPart.GetWorldPosition(), + MetaEntity.TRANSLUCENT, + new Vector3(0,0,254), + UnchangedPart.Scale + ); + m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); + SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); + + DiffersFromSceneGroup = true; + } + else // no differences between scene part and meta part + { + if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID)) + { + m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll(); + m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID); + } + if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) + { + m_AuraEntities[UnchangedPart.UUID].HideFromAll(); + m_AuraEntities.Remove(UnchangedPart.UUID); + } + SetPartTransparency(metaEntityPart, MetaEntity.NONE); + } + } + else //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted. + { + if (m_AuraEntities.ContainsKey(UnchangedPart.UUID)) + { + m_AuraEntities[UnchangedPart.UUID].HideFromAll(); + m_AuraEntities.Remove(UnchangedPart.UUID); + } + AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene, + m_Entity.Scene.PrimIDAllocate(), + UnchangedPart.GetWorldPosition(), + MetaEntity.TRANSLUCENT, + new Vector3(254,0,0), + UnchangedPart.Scale + ); + m_AuraEntities.Add(UnchangedPart.UUID, auraGroup); + SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT); + + DiffersFromSceneGroup = true; + } } return changed; } @@ -328,8 +328,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { if (DiffersFromSceneGroup) { - foreach(AuraMetaEntity group in m_AuraEntities.Values) - group.SendFullUpdate(client); + foreach (AuraMetaEntity group in m_AuraEntities.Values) + group.SendFullUpdate(client); } } @@ -337,8 +337,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { if (DiffersFromSceneGroup) { - foreach(AuraMetaEntity group in m_AuraEntities.Values) - group.SendFullUpdateToAll(); + foreach (AuraMetaEntity group in m_AuraEntities.Values) + group.SendFullUpdateToAll(); } } @@ -346,8 +346,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { if (DiffersFromSceneGroup) { - foreach(BeamMetaEntity group in m_BeamEntities.Values) - group.SendFullUpdate(client); + foreach (BeamMetaEntity group in m_BeamEntities.Values) + group.SendFullUpdate(client); } } @@ -355,8 +355,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { if (DiffersFromSceneGroup) { - foreach(BeamMetaEntity group in m_BeamEntities.Values) - group.SendFullUpdateToAll(); + foreach (BeamMetaEntity group in m_BeamEntities.Values) + group.SendFullUpdateToAll(); } } @@ -365,9 +365,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement FindDifferences(); if (DiffersFromSceneGroup) { - SendFullUpdate(client); - SendFullAuraUpdate(client); - SendFullBeamUpdate(client); + SendFullUpdate(client); + SendFullAuraUpdate(client); + SendFullBeamUpdate(client); } } @@ -376,9 +376,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement FindDifferences(); if (DiffersFromSceneGroup) { - SendFullUpdateToAll(); - SendFullAuraUpdateToAll(); - SendFullBeamUpdateToAll(); + SendFullUpdateToAll(); + SendFullAuraUpdateToAll(); + SendFullBeamUpdateToAll(); } } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs index 85eb927..f52c3b8 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs @@ -27,7 +27,7 @@ #region Header -// ContentManagementModule.cs +// ContentManagementModule.cs // User: bongiojp #endregion Header @@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { if (source.Configs["CMS"] == null) return; - + m_enabled = source.Configs["CMS"].GetBoolean("enabled", false); databaseDir = source.Configs["CMS"].GetString("directory", databaseDir); database = source.Configs["CMS"].GetString("database", database); @@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement return; } - lock(this) + lock (this) { if (!initialised) //only init once { @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_control = new CMController(m_model, m_view, scene, channel); m_model.Initialise(database); m_view.Initialise(m_model); - + initialised = true; m_model.InitialiseDatabase(scene, databaseDir); } @@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement if (! m_enabled) return; - lock(this) + lock (this) { if (!m_posted) //only post once { diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs index 66d279a..607f6a9 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs @@ -28,7 +28,7 @@ #region Header // FileSystemDatabase.cs -// User: bongiojp +// User: bongiojp #endregion Header @@ -88,13 +88,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { string scenedir; if (!Directory.Exists(m_repodir)) - Directory.CreateDirectory(m_repodir); + Directory.CreateDirectory(m_repodir); foreach (UUID region in m_scenes.Keys) { - scenedir = m_repodir + Slash.DirectorySeparatorChar + region + Slash.DirectorySeparatorChar; - if (!Directory.Exists(scenedir)) - Directory.CreateDirectory(scenedir); + scenedir = m_repodir + Slash.DirectorySeparatorChar + region + Slash.DirectorySeparatorChar; + if (!Directory.Exists(scenedir)) + Directory.CreateDirectory(scenedir); } } @@ -102,10 +102,14 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement private void SetupSerialiser() { if (m_serialiser.Count == 0) - foreach(UUID region in m_scenes.Keys) - m_serialiser.Add(region, - m_scenes[region].RequestModuleInterface() - ); + { + foreach (UUID region in m_scenes.Keys) + { + m_serialiser.Add(region, + m_scenes[region].RequestModuleInterface() + ); + } + } } #endregion Private Methods @@ -120,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public string GetRegionObjectHeightMap(UUID regionid) { String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + - Slash.DirectorySeparatorChar + "heightmap.r32"; + Slash.DirectorySeparatorChar + "heightmap.r32"; FileStream fs = new FileStream( filename, FileMode.Open); StreamReader sr = new StreamReader(fs); String result = sr.ReadToEnd(); @@ -132,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public string GetRegionObjectHeightMap(UUID regionid, int revision) { String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + - Slash.DirectorySeparatorChar + "heightmap.r32"; + Slash.DirectorySeparatorChar + "heightmap.r32"; FileStream fs = new FileStream( filename, FileMode.Open); StreamReader sr = new StreamReader(fs); String result = sr.ReadToEnd(); @@ -144,14 +148,14 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public System.Collections.ArrayList GetRegionObjectXMLList(UUID regionid, int revision) { System.Collections.ArrayList objectList = new System.Collections.ArrayList(); - string filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + - + revision + Slash.DirectorySeparatorChar + "objects.xml"; + string filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + + + revision + Slash.DirectorySeparatorChar + "objects.xml"; XmlDocument doc = new XmlDocument(); XmlNode rootNode; //int primCount = 0; //SceneObjectGroup obj = null; - if(File.Exists(filename)) + if (File.Exists(filename)) { XmlTextReader reader = new XmlTextReader(filename); reader.WhitespaceHandling = WhitespaceHandling.None; @@ -160,9 +164,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement rootNode = doc.FirstChild; foreach (XmlNode aPrimNode in rootNode.ChildNodes) { - objectList.Add(aPrimNode.OuterXml); - } - return objectList; + objectList.Add(aPrimNode.OuterXml); + } + return objectList; } return null; } @@ -172,45 +176,46 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement int revision = NumOfRegionRev(regionid); m_log.Info("[FSDB]: found revisions:" + revision); System.Collections.ArrayList xmlList = new System.Collections.ArrayList(); - string filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + - + revision + Slash.DirectorySeparatorChar + "objects.xml"; + string filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + + + revision + Slash.DirectorySeparatorChar + "objects.xml"; XmlDocument doc = new XmlDocument(); XmlNode rootNode; - m_log.Info("[FSDB]: Checking if " + filename + " exists."); - if(File.Exists(filename)) - { - Stopwatch x = new Stopwatch(); - x.Start(); - + if (File.Exists(filename)) + { + Stopwatch x = new Stopwatch(); + x.Start(); + XmlTextReader reader = new XmlTextReader(filename); reader.WhitespaceHandling = WhitespaceHandling.None; doc.Load(reader); reader.Close(); rootNode = doc.FirstChild; - + foreach (XmlNode aPrimNode in rootNode.ChildNodes) - xmlList.Add(aPrimNode.OuterXml); - - x.Stop(); - TimeToDownload += x.ElapsedMilliseconds; - m_log.Info("[FileSystemDatabase] Time spent retrieving xml files so far: " + TimeToDownload); - - return xmlList; + { + xmlList.Add(aPrimNode.OuterXml); + } + + x.Stop(); + TimeToDownload += x.ElapsedMilliseconds; + m_log.Info("[FileSystemDatabase] Time spent retrieving xml files so far: " + TimeToDownload); + + return xmlList; } return null; } public void Initialise(Scene scene, string dir) { - lock(this) + lock (this) { - if (m_repodir == null) - m_repodir = dir; + if (m_repodir == null) + m_repodir = dir; } - lock(m_scenes) - m_scenes.Add(scene.RegionInfo.RegionID, scene); + lock (m_scenes) + m_scenes.Add(scene.RegionInfo.RegionID, scene); } public System.Collections.Generic.SortedDictionary ListOfRegionRevisions(UUID regionid) @@ -224,19 +229,21 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement StreamReader sr = null; String logMessage = ""; String logLocation = ""; - foreach(string revisionDir in directories) + foreach (string revisionDir in directories) { - try { - logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; - fs = new FileStream( logLocation, FileMode.Open); - sr = new StreamReader(fs); - logMessage = sr.ReadToEnd(); - sr.Close(); - fs.Close(); - revisionDict.Add(revisionDir, logMessage); - } - catch (Exception) - {} + try + { + logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; + fs = new FileStream( logLocation, FileMode.Open); + sr = new StreamReader(fs); + logMessage = sr.ReadToEnd(); + sr.Close(); + fs.Close(); + revisionDict.Add(revisionDir, logMessage); + } + catch (Exception) + { + } } return revisionDict; @@ -254,9 +261,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement public void PostInitialise() { SetupSerialiser(); - - m_log.Info("[FSDB]: Creating repository in " + m_repodir + "."); - CreateDirectory(); + + m_log.Info("[FSDB]: Creating repository in " + m_repodir + "."); + CreateDirectory(); } public void SaveRegion(UUID regionid, string regionName, string logMessage) @@ -266,44 +273,44 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement m_log.Info("[FSDB]: checking if scene directory exists: " + scenedir); if (!Directory.Exists(scenedir)) - Directory.CreateDirectory(scenedir); + Directory.CreateDirectory(scenedir); int newRevisionNum = GetMostRecentRevision(regionid)+1; string revisiondir = scenedir + newRevisionNum + Slash.DirectorySeparatorChar; m_log.Info("[FSDB]: checking if revision directory exists: " + revisiondir); if (!Directory.Exists(revisiondir)) - Directory.CreateDirectory(revisiondir); - - try { - Stopwatch x = new Stopwatch(); - x.Start(); - if (m_scenes.ContainsKey(regionid)) - { - m_serialiser[regionid].SerialiseRegion(m_scenes[regionid], revisiondir); - } - x.Stop(); - TimeToSave += x.ElapsedMilliseconds; - m_log.Info("[FileSystemDatabase] Time spent serialising regions to files on disk for " + regionName + ": " + x.ElapsedMilliseconds); - m_log.Info("[FileSystemDatabase] Time spent serialising regions to files on disk so far: " + TimeToSave); + Directory.CreateDirectory(revisiondir); + + try { + Stopwatch x = new Stopwatch(); + x.Start(); + if (m_scenes.ContainsKey(regionid)) + { + m_serialiser[regionid].SerialiseRegion(m_scenes[regionid], revisiondir); + } + x.Stop(); + TimeToSave += x.ElapsedMilliseconds; + m_log.Info("[FileSystemDatabase] Time spent serialising regions to files on disk for " + regionName + ": " + x.ElapsedMilliseconds); + m_log.Info("[FileSystemDatabase] Time spent serialising regions to files on disk so far: " + TimeToSave); } catch (Exception e) { - m_log.ErrorFormat("[FSDB]: Serialisation of region failed: " + e); - return; + m_log.ErrorFormat("[FSDB]: Serialisation of region failed: " + e); + return; } try { - // Finish by writing log message. - FileStream file = new FileStream(revisiondir + "log", FileMode.Create, FileAccess.ReadWrite); - StreamWriter sw = new StreamWriter(file); - sw.Write(logMessage); - sw.Close(); + // Finish by writing log message. + FileStream file = new FileStream(revisiondir + "log", FileMode.Create, FileAccess.ReadWrite); + StreamWriter sw = new StreamWriter(file); + sw.Write(logMessage); + sw.Close(); } catch (Exception e) { - m_log.ErrorFormat("[FSDB]: Failed trying to save log file " + e); - return; + m_log.ErrorFormat("[FSDB]: Failed trying to save log file " + e); + return; } } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs index 5a6dbc8..a494ff6 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs @@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement } /// - /// Makes a new meta entity by copying the given scene object group. + /// Makes a new meta entity by copying the given scene object group. /// The physics boolean is just a stub right now. /// public MetaEntity(SceneObjectGroup orig, bool physics) @@ -160,19 +160,19 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { //make new uuids Dictionary parts = new Dictionary(); - foreach(SceneObjectPart part in m_Entity.Children.Values) + foreach (SceneObjectPart part in m_Entity.Children.Values) { - part.ResetIDs(part.LinkNum); - parts.Add(part.UUID, part); + part.ResetIDs(part.LinkNum); + parts.Add(part.UUID, part); } // make new localids foreach (SceneObjectPart part in m_Entity.Children.Values) - part.LocalId = m_Entity.Scene.PrimIDAllocate(); + part.LocalId = m_Entity.Scene.PrimIDAllocate(); //finalize m_Entity.UpdateParentIDs(); - m_Entity.RootPart.PhysActor = null; + m_Entity.RootPart.PhysActor = null; m_Entity.Children = parts; } @@ -188,8 +188,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement //This deletes the group without removing from any databases. //This is important because we are not IN any database. //m_Entity.FakeDeleteGroup(); - foreach( SceneObjectPart part in m_Entity.Children.Values) - client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); + foreach (SceneObjectPart part in m_Entity.Children.Values) + client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } /// @@ -197,10 +197,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement /// public virtual void HideFromAll() { - foreach( SceneObjectPart part in m_Entity.Children.Values) - m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) - { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } - ); + foreach (SceneObjectPart part in m_Entity.Children.Values) + m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) + { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } + ); } public void SendFullUpdate(IClientAPI client) @@ -239,40 +239,40 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement Color4 texcolor; try { - tex = part.Shape.Textures; - texcolor = new Color4(); + tex = part.Shape.Textures; + texcolor = new Color4(); } catch(Exception) { - //m_log.ErrorFormat("[Content Management]: Exception thrown while accessing textures of scene object: " + e); - return; + //m_log.ErrorFormat("[Content Management]: Exception thrown while accessing textures of scene object: " + e); + return; } for (uint i = 0; i < tex.FaceTextures.Length; i++) { - try { - if (tex.FaceTextures[i] != null) - { - texcolor = tex.FaceTextures[i].RGBA; - texcolor.A = transparencyAmount; - tex.FaceTextures[i].RGBA = texcolor; - } - } - catch (Exception) - { - //m_log.ErrorFormat("[Content Management]: Exception thrown while accessing different face textures of object: " + e); - continue; - } + try { + if (tex.FaceTextures[i] != null) + { + texcolor = tex.FaceTextures[i].RGBA; + texcolor.A = transparencyAmount; + tex.FaceTextures[i].RGBA = texcolor; + } + } + catch (Exception) + { + //m_log.ErrorFormat("[Content Management]: Exception thrown while accessing different face textures of object: " + e); + continue; + } } try { - texcolor = tex.DefaultTexture.RGBA; - texcolor.A = transparencyAmount; - tex.DefaultTexture.RGBA = texcolor; - part.Shape.TextureEntry = tex.ToBytes(); + texcolor = tex.DefaultTexture.RGBA; + texcolor.A = transparencyAmount; + tex.DefaultTexture.RGBA = texcolor; + part.Shape.TextureEntry = tex.ToBytes(); } catch (Exception) { - //m_log.Info("[Content Management]: Exception thrown while accessing default face texture of object: " + e); + //m_log.Info("[Content Management]: Exception thrown while accessing default face texture of object: " + e); } } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs index b0c6955..81746c5 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs @@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement y.UUID = uuid; y.LocalId = LocalId; - + y.Shape = PrimitiveBaseShape.CreateBox(); y.Scale = new Vector3(0.01f,0.01f,0.01f); y.LastOwnerID = UUID.Zero; diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs index ba937f5..79e970d 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs @@ -106,13 +106,13 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement private static bool AreVectorsEquivalent(Vector3 first, Vector3 second) { - if(TruncateSignificant(first.X, 2) == TruncateSignificant(second.X, 2) + if (TruncateSignificant(first.X, 2) == TruncateSignificant(second.X, 2) && TruncateSignificant(first.Y, 2) == TruncateSignificant(second.Y, 2) && TruncateSignificant(first.Z, 2) == TruncateSignificant(second.Z, 2) ) - return true; + return true; else - return false; + return false; } // Taken from Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -126,7 +126,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement private static int TruncateSignificant(float num, int digits) { return (int) Math.Ceiling((Math.Truncate(num * 10 * digits)/10*digits)); - // return (int) ((num * (10*digits))/10*digits); + // return (int) ((num * (10*digits))/10*digits); } // Taken from Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement #region Public Methods /// - /// Compares the attributes (Vectors, Quaternions, Strings, etc.) between two scene object parts + /// Compares the attributes (Vectors, Quaternions, Strings, etc.) between two scene object parts /// and returns a Diff bitmask which details what the differences are. /// public static Diff FindDifferences(SceneObjectPart first, SceneObjectPart second) @@ -164,47 +164,47 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement Diff result = 0; // VECTOR COMPARISONS - if(! AreVectorsEquivalent(first.Acceleration, second.Acceleration)) - result |= Diff.ACCELERATION; - if(! AreVectorsEquivalent(first.AbsolutePosition, second.AbsolutePosition)) - result |= Diff.POSITION; - if(! AreVectorsEquivalent(first.AngularVelocity, second.AngularVelocity)) - result |= Diff.ANGULARVELOCITY; - if(! AreVectorsEquivalent(first.OffsetPosition, second.OffsetPosition)) - result |= Diff.OFFSETPOSITION; - if(! AreVectorsEquivalent(first.RotationalVelocity, second.RotationalVelocity)) - result |= Diff.ROTATIONALVELOCITY; - if(! AreVectorsEquivalent(first.Scale, second.Scale)) - result |= Diff.SCALE; - if(! AreVectorsEquivalent(first.Velocity, second.Velocity)) - result |= Diff.VELOCITY; + if (!AreVectorsEquivalent(first.Acceleration, second.Acceleration)) + result |= Diff.ACCELERATION; + if (!AreVectorsEquivalent(first.AbsolutePosition, second.AbsolutePosition)) + result |= Diff.POSITION; + if (!AreVectorsEquivalent(first.AngularVelocity, second.AngularVelocity)) + result |= Diff.ANGULARVELOCITY; + if (!AreVectorsEquivalent(first.OffsetPosition, second.OffsetPosition)) + result |= Diff.OFFSETPOSITION; + if (!AreVectorsEquivalent(first.RotationalVelocity, second.RotationalVelocity)) + result |= Diff.ROTATIONALVELOCITY; + if (!AreVectorsEquivalent(first.Scale, second.Scale)) + result |= Diff.SCALE; + if (!AreVectorsEquivalent(first.Velocity, second.Velocity)) + result |= Diff.VELOCITY; // QUATERNION COMPARISONS - if(! AreQuaternionsEquivalent(first.RotationOffset, second.RotationOffset)) - result |= Diff.ROTATIONOFFSET; + if (!AreQuaternionsEquivalent(first.RotationOffset, second.RotationOffset)) + result |= Diff.ROTATIONOFFSET; // MISC COMPARISONS (UUID, Byte) - if(first.ClickAction != second.ClickAction) - result |= Diff.CLICKACTION; - if(first.ObjectOwner != second.ObjectOwner) - result |= Diff.OBJECTOWNER; + if (first.ClickAction != second.ClickAction) + result |= Diff.CLICKACTION; + if (first.ObjectOwner != second.ObjectOwner) + result |= Diff.OBJECTOWNER; // STRING COMPARISONS - if(first.Description != second.Description) - result |= Diff.DESCRIPTION; - if(first.Material != second.Material) - result |= Diff.MATERIAL; - if(first.Name != second.Name) - result |= Diff.NAME; - if(first.SitName != second.SitName) - result |= Diff.SITNAME; - if(first.Text != second.Text) - result |= Diff.TEXT; - if(first.TouchName != second.TouchName) - result |= Diff.TOUCHNAME; + if (first.Description != second.Description) + result |= Diff.DESCRIPTION; + if (first.Material != second.Material) + result |= Diff.MATERIAL; + if (first.Name != second.Name) + result |= Diff.NAME; + if (first.SitName != second.SitName) + result |= Diff.SITNAME; + if (first.Text != second.Text) + result |= Diff.TEXT; + if (first.TouchName != second.TouchName) + result |= Diff.TOUCHNAME; x.Stop(); TimeToDiff += x.ElapsedMilliseconds; diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index a59148b..4a51398 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -176,8 +176,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// within this object). /// /// - /// - protected void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary assetUuids) + /// + protected void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary assetUuids) { AssetBase objectAsset = GetAsset(sceneObjectUuid); diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 976a634..bec1300 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture) { - if(texture == UUID.Zero) + if (texture == UUID.Zero) return; switch (corner) diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 541ca18..8bf0d96 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -388,10 +388,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC get { return 0; } } - public ulong GetGroupPowers(UUID groupID) - { - return 0; - } + public ulong GetGroupPowers(UUID groupID) + { + return 0; + } public virtual int NextAnimationSequenceNumber { diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs index 09eb84f..cd59f2a 100644 --- a/OpenSim/Region/Environment/Scenes/EntityList.cs +++ b/OpenSim/Region/Environment/Scenes/EntityList.cs @@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes // FindObject(UUID) // FindObject(int) // FindPresence(UUID) - + public void Add(SceneObjectGroup obj) { m_obj_by_uuid[obj.UUID] = obj; @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes public SceneObjectGroup RemoveObject(UUID uuid) { SceneObjectGroup sog = null; - try + try { sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; m_obj_by_uuid.Remove(uuid); @@ -99,11 +99,11 @@ namespace OpenSim.Region.Environment.Scenes } return sog; } - + public ScenePresence RemovePresence(UUID uuid) { ScenePresence sp = null; - try + try { sp = (ScenePresence)m_pres_by_uuid[uuid]; m_pres_by_uuid.Remove(uuid); @@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment.Scenes m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e); sp = null; } - return sp; + return sp; } public SceneObjectGroup FindObject(UUID uuid) @@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes public SceneObjectGroup FindObject(int local) { - try + try { UUID uuid = (UUID)m_obj_by_local[local]; SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 53b0a38..bfe6832 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes List updateEntities = GetEntities(); foreach (EntityBase entity in updateEntities) - { + { entity.Update(); } } @@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Scenes // Don't abort the whole update if one entity happens to give us an exception. try { - m_updateList[i].Update(); + m_updateList[i].Update(); } catch (Exception e) { diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 3c34f73..c049e86 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1581,7 +1581,7 @@ namespace OpenSim.Region.Environment.Scenes /// Schedule a terse update for this scene object /// public void ScheduleGroupForTerseUpdate() - { + { lock (m_parts) { foreach (SceneObjectPart part in m_parts.Values) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 17c5f04..352de27 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Environment.Scenes public static SceneObjectPart FromXml(XmlReader xmlReader) { // It's not necessary to persist this - + XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart)); SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader); return newobject; diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 8f579bd..149126c 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -287,10 +287,10 @@ namespace OpenSim.Region.Examples.SimpleModule get { return 0; } } - public ulong GetGroupPowers(UUID groupID) - { - return 0; - } + public ulong GetGroupPowers(UUID groupID) + { + return 0; + } public virtual int NextAnimationSequenceNumber { diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index f955c52..a7514b6 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -1990,7 +1990,7 @@ namespace OpenSim.Region.Physics.Meshing Face f = faces[i]; mesh.triangles.Add(new Triangle(vertices[f.v1], vertices[f.v2], vertices[f.v3])); } - + //for (int i = 0; i < numFaces; i++) //{ // Face f = primMesh.faces[i]; diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index 08b2d10..63f2b10 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs @@ -87,71 +87,71 @@ namespace OpenSim.Region.Physics.Meshing //[1.0f, 1.0f, -2.4492127076447545e-016f]]; /* angles3 = [ - [0.0, 1.0, 0.0], - [0.33333333333333331, -0.49999999999999978, 0.86602540378443871], - [0.66666666666666663, -0.50000000000000044, -0.86602540378443837], - [1.0, 1.0, -2.4492127076447545e-016]] - + [0.0, 1.0, 0.0], + [0.33333333333333331, -0.49999999999999978, 0.86602540378443871], + [0.66666666666666663, -0.50000000000000044, -0.86602540378443837], + [1.0, 1.0, -2.4492127076447545e-016]] + angles4 = [ - [0.0, 1.0, 0.0], - [0.25, 0.0, 1.0], - [0.5, -1.0, 0.0], - [0.75, 0.0, -1.0], - [1.0, 1.0, 0.0]] + [0.0, 1.0, 0.0], + [0.25, 0.0, 1.0], + [0.5, -1.0, 0.0], + [0.75, 0.0, -1.0], + [1.0, 1.0, 0.0]] angles24 = [ - [0.0, 0.5, 0.0], - [0.041666666666666664, 0.48296291314453416, 0.12940952255126037], - [0.083333333333333329, 0.43301270189221935, 0.25], - [0.125, 0.35355339059327379, 0.35355339059327373], - [0.16666666666666666, 0.25, 0.4330127018922193], - [0.20833333333333331, 0.12940952255126048, 0.4829629131445341], - [0.25, 0.0, 0.5], - [0.29166666666666663, -0.12940952255126031, 0.48296291314453416], - [0.33333333333333331, -0.25, 0.43301270189221935], - [0.375, -0.35355339059327373, 0.35355339059327379], - [0.41666666666666663, -0.43301270189221924, 0.25], - [0.45833333333333331, -0.4829629131445341, 0.12940952255126051], - [0.5, -0.5, 0.0], - [0.54166666666666663, -0.48296291314453421, -0.12940952255126018], - [0.58333333333333326, -0.43301270189221941, -0.25], - [0.62499999999999989, -0.35355339059327395, -0.35355339059327356], - [0.66666666666666663, -0.25, -0.43301270189221919], - [0.70833333333333326, -0.12940952255126076, -0.48296291314453405], - [0.75, 0.0, -0.5], - [0.79166666666666663, 0.12940952255126015, -0.48296291314453421], - [0.83333333333333326, 0.25, -0.43301270189221952], - [0.875, 0.35355339059327368, -0.35355339059327384], - [0.91666666666666663, 0.43301270189221919, -0.25], - [0.95833333333333326, 0.48296291314453405, -0.12940952255126079], - [1.0, 0.5, 0.0]] - + [0.0, 0.5, 0.0], + [0.041666666666666664, 0.48296291314453416, 0.12940952255126037], + [0.083333333333333329, 0.43301270189221935, 0.25], + [0.125, 0.35355339059327379, 0.35355339059327373], + [0.16666666666666666, 0.25, 0.4330127018922193], + [0.20833333333333331, 0.12940952255126048, 0.4829629131445341], + [0.25, 0.0, 0.5], + [0.29166666666666663, -0.12940952255126031, 0.48296291314453416], + [0.33333333333333331, -0.25, 0.43301270189221935], + [0.375, -0.35355339059327373, 0.35355339059327379], + [0.41666666666666663, -0.43301270189221924, 0.25], + [0.45833333333333331, -0.4829629131445341, 0.12940952255126051], + [0.5, -0.5, 0.0], + [0.54166666666666663, -0.48296291314453421, -0.12940952255126018], + [0.58333333333333326, -0.43301270189221941, -0.25], + [0.62499999999999989, -0.35355339059327395, -0.35355339059327356], + [0.66666666666666663, -0.25, -0.43301270189221919], + [0.70833333333333326, -0.12940952255126076, -0.48296291314453405], + [0.75, 0.0, -0.5], + [0.79166666666666663, 0.12940952255126015, -0.48296291314453421], + [0.83333333333333326, 0.25, -0.43301270189221952], + [0.875, 0.35355339059327368, -0.35355339059327384], + [0.91666666666666663, 0.43301270189221919, -0.25], + [0.95833333333333326, 0.48296291314453405, -0.12940952255126079], + [1.0, 0.5, 0.0]] + angles24 = [ - [0.0, 1.0, 0.0], - [0.041666666666666664, 0.96592582628906831, 0.25881904510252074], - [0.083333333333333329, 0.86602540378443871, 0.5], - [0.125, 0.70710678118654757, 0.70710678118654746], - [0.16666666666666667, 0.5, 0.8660254037844386], - [0.20833333333333331, 0.25881904510252096, 0.9659258262890682], - [0.25, 6.1230317691118863e-017, 1.0], - [0.29166666666666663, -0.25881904510252063, 0.96592582628906831], - [0.33333333333333333, -0.5, 0.86602540378443871], - [0.375, -0.70710678118654746, 0.70710678118654757], - [0.41666666666666663, -0.86602540378443849, 0.5], - [0.45833333333333331, -0.9659258262890682, 0.25881904510252102], - [0.5, -1.0, 1.2246063538223773e-016], - [0.54166666666666663, -0.96592582628906842, -0.25881904510252035], - [0.58333333333333326, -0.86602540378443882, -0.5], - [0.62499999999999989, -0.70710678118654791, -0.70710678118654713], - [0.66666666666666667, -0.5, -0.86602540378443837], - [0.70833333333333326, -0.25881904510252152, -0.96592582628906809], - [0.75, -1.8369095307335659e-016, -1.0], - [0.79166666666666663, 0.2588190451025203, -0.96592582628906842], - [0.83333333333333326, 0.5, -0.86602540378443904], - [0.875, 0.70710678118654735, -0.70710678118654768], - [0.91666666666666663, 0.86602540378443837, -0.5], - [0.95833333333333326, 0.96592582628906809, -0.25881904510252157], - [1.0, 1.0, -2.4492127076447545e-016]] + [0.0, 1.0, 0.0], + [0.041666666666666664, 0.96592582628906831, 0.25881904510252074], + [0.083333333333333329, 0.86602540378443871, 0.5], + [0.125, 0.70710678118654757, 0.70710678118654746], + [0.16666666666666667, 0.5, 0.8660254037844386], + [0.20833333333333331, 0.25881904510252096, 0.9659258262890682], + [0.25, 6.1230317691118863e-017, 1.0], + [0.29166666666666663, -0.25881904510252063, 0.96592582628906831], + [0.33333333333333333, -0.5, 0.86602540378443871], + [0.375, -0.70710678118654746, 0.70710678118654757], + [0.41666666666666663, -0.86602540378443849, 0.5], + [0.45833333333333331, -0.9659258262890682, 0.25881904510252102], + [0.5, -1.0, 1.2246063538223773e-016], + [0.54166666666666663, -0.96592582628906842, -0.25881904510252035], + [0.58333333333333326, -0.86602540378443882, -0.5], + [0.62499999999999989, -0.70710678118654791, -0.70710678118654713], + [0.66666666666666667, -0.5, -0.86602540378443837], + [0.70833333333333326, -0.25881904510252152, -0.96592582628906809], + [0.75, -1.8369095307335659e-016, -1.0], + [0.79166666666666663, 0.2588190451025203, -0.96592582628906842], + [0.83333333333333326, 0.5, -0.86602540378443904], + [0.875, 0.70710678118654735, -0.70710678118654768], + [0.91666666666666663, 0.86602540378443837, -0.5], + [0.95833333333333326, 0.96592582628906809, -0.25881904510252157], + [1.0, 1.0, -2.4492127076447545e-016]] */ @@ -159,15 +159,15 @@ angles24 = [ { private float iX, iY; // intersection point - private Angle[] angles3 = + private Angle[] angles3 = { - new Angle(0.0f, 1.0f, 0.0f), - new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f), - new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f), - new Angle(1.0f, 1.0f, 0.0f) + new Angle(0.0f, 1.0f, 0.0f), + new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f), + new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f), + new Angle(1.0f, 1.0f, 0.0f) }; - private Angle[] angles4 = + private Angle[] angles4 = { new Angle(0.0f, 1.0f, 0.0f), new Angle(0.25f, 0.0f, 1.0f), @@ -179,30 +179,30 @@ angles24 = [ private Angle[] angles24 = { new Angle(0.0f, 1.0f, 0.0f), - new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f), - new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f), - new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f), - new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f), - new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f), - new Angle(0.25f, 0.0f, 1.0f), - new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f), - new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f), - new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f), - new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f), - new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f), - new Angle(0.5f, -1.0f, 0.0f), - new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f), - new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f), - new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f), - new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f), - new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f), - new Angle(0.75f, 0.0f, -1.0f), - new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f), - new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f), - new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f), - new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f), - new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f), - new Angle(1.0f, 1.0f, 0.0f) + new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f), + new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f), + new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f), + new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f), + new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f), + new Angle(0.25f, 0.0f, 1.0f), + new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f), + new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f), + new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f), + new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f), + new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f), + new Angle(0.5f, -1.0f, 0.0f), + new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f), + new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f), + new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f), + new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f), + new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f), + new Angle(0.75f, 0.0f, -1.0f), + new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f), + new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f), + new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f), + new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f), + new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f), + new Angle(1.0f, 1.0f, 0.0f) }; private Angle interpolatePoints(float newPoint, Angle p1, Angle p2) diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index ebf2a15..9405198 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -7546,7 +7546,7 @@ namespace OpenSim.Region.ScriptEngine.Common // the object we are in UUID objectID = m_host.ParentUUID; - if(objectID == UUID.Zero) return; + if (objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -7597,7 +7597,7 @@ namespace OpenSim.Region.ScriptEngine.Common // the object we are in UUID objectID = m_host.ParentUUID; - if(objectID == UUID.Zero) return; + if (objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ae775f7..4b70ec8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -7418,7 +7418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // the object we are in UUID objectID = m_host.ParentUUID; - if(objectID == UUID.Zero) return; + if (objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to set the camera for UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; @@ -7469,7 +7469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // the object we are in UUID objectID = m_host.ParentUUID; - if(objectID == UUID.Zero) return; + if (objectID == UUID.Zero) return; // we need the permission first, to know which avatar we want to clear the camera for UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 97c79b5..1ee6f77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -686,7 +686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance { // If we're currently in an event, just tell it to save upon return // - if(m_InEvent) + if (m_InEvent) { m_SaveState = true; return; diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index bb08a60..6582686 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -216,13 +216,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (sleepTime > 0) { - m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), + m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), new Object[]{ sleepTime }); } if (saveTime > 0) { - m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), + m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), new Object[] { saveTime }); } @@ -278,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine instances.Clear(); if (saveTime > 0) - m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), + m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), new Object[] { saveTime }); return 0; @@ -301,7 +301,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine System.Threading.Thread.Sleep(sleepTime); - m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), + m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), new Object[]{ sleepTime }); return 0; @@ -331,13 +331,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine { m_firstStart = false; m_CurrentCompile = m_ThreadPool.QueueWorkItem( - new WorkItemCallback(this.DoScriptWait), + new WorkItemCallback(this.DoScriptWait), new Object[0]); return; } m_CurrentCompile = m_ThreadPool.QueueWorkItem( - new WorkItemCallback(this.DoOnRezScriptQueue), + new WorkItemCallback(this.DoOnRezScriptQueue), new Object[0]); } } @@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (m_CompileQueue.Count > 0) { m_CurrentCompile = m_ThreadPool.QueueWorkItem( - new WorkItemCallback(this.DoOnRezScriptQueue), + new WorkItemCallback(this.DoOnRezScriptQueue), new Object[0]); } else @@ -383,7 +383,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (m_CompileQueue.Count > 0) { m_CurrentCompile = m_ThreadPool.QueueWorkItem( - new WorkItemCallback(this.DoOnRezScriptQueue), + new WorkItemCallback(this.DoOnRezScriptQueue), new Object[0]); } else @@ -493,7 +493,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } m_DomainScripts[appDomain].Add(itemID); - ScriptInstance instance = + ScriptInstance instance = new ScriptInstance(this,localID, part.UUID, itemID, assetID, assembly, m_AppDomains[appDomain], @@ -657,7 +657,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine public IScriptWorkItem QueueEventHandler(object parms) { return new XWorkItem(m_ThreadPool.QueueWorkItem( - new WorkItemCallback(this.ProcessEventHandler), + new WorkItemCallback(this.ProcessEventHandler), parms)); } @@ -723,7 +723,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine string[] pathList = new string[] {"bin", "ScriptEngines", Path.Combine("ScriptEngines", m_Scene.RegionInfo.RegionID.ToString())}; - + string assemblyName = args.Name; if (assemblyName.IndexOf(",") != -1) assemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); -- cgit v1.1