From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 25 May 2008 23:27:38 +0000 Subject: Update svn properties. Formatting cleanup. --- OpenSim/Region/Application/OpenSimMain.cs | 16 ++++----- OpenSim/Region/Application/OpenSimMainConsole.cs | 16 ++++----- .../Region/ClientStack/LindenUDP/LLClientView.cs | 25 ++++++-------- .../Region/ClientStack/LindenUDP/LLPacketQueue.cs | 4 +-- OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 6 ++-- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 16 ++++----- .../Modules/Avatar/Chat/IRCBridgeModule.cs | 16 ++++----- .../Voice/AsterixVoice/AsteriskVoiceModule.cs | 4 +-- .../Avatar/Voice/SIPVoice/SIPVoiceModule.cs | 4 +-- .../Modules/World/Archiver/ArchiverModule.cs | 40 +++++++++++----------- .../Modules/World/Archiver/IRegionArchiver.cs | 4 +-- .../Environment/Modules/World/Land/LandObject.cs | 6 ++-- OpenSim/Region/Environment/Scenes/InnerScene.cs | 12 +++---- .../Region/Environment/Scenes/Scene.Inventory.cs | 24 ++++++------- OpenSim/Region/Environment/Scenes/Scene.cs | 34 +++++++++--------- OpenSim/Region/Environment/Scenes/SceneManager.cs | 8 ++--- .../Region/Environment/Scenes/SceneObjectGroup.cs | 26 +++++++------- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 +-- .../Modules/AvatarFactory/AvatarFactoryModule.cs | 10 +++--- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 13 ++++--- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 4 +-- 21 files changed, 146 insertions(+), 147 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf12be7..dec0311 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -66,7 +66,7 @@ namespace OpenSim /// The file used to load and save prim backup xml if none has been specified /// protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; - + /// /// The file use to load and save an opensim archive if none has been specified /// @@ -354,7 +354,7 @@ namespace OpenSim } /// - /// Enhance the version string with extra information if it's available. + /// Enhance the version string with extra information if it's available. /// protected void EnhanceVersionInformation() { @@ -387,7 +387,7 @@ namespace OpenSim if (!string.IsNullOrEmpty(buildVersion)) { VersionInfo.Version += ", SVN build r" + buildVersion; - } + } else { VersionInfo.Version += ", SVN build revision not available"; @@ -407,9 +407,9 @@ namespace OpenSim if (OSString.Length > 45) { OSString = OSString.Substring(0, 45); - } - - VersionInfo.Version += ", OS " + OSString; + } + + VersionInfo.Version += ", OS " + OSString; } /// @@ -418,7 +418,7 @@ namespace OpenSim protected void InternalStartUp() { EnhanceVersionInformation(); - + m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); m_stats = StatsManager.StartCollectingSimExtraStats(); @@ -710,7 +710,7 @@ namespace OpenSim /// protected class SimStatusHandler : IStreamedRequestHandler { - public byte[] Handle(string path, Stream request, + public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return Encoding.UTF8.GetBytes("OK"); diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index dd14c59..e4590f2 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs @@ -291,7 +291,7 @@ namespace OpenSim break; case "save-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); @@ -304,7 +304,7 @@ namespace OpenSim case "load-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); - + LLVector3 loadOffset = new LLVector3(0, 0, 0); if (cmdparams.Length > 0) { @@ -359,10 +359,10 @@ namespace OpenSim m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); } break; - + case "save-oar": m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); @@ -371,7 +371,7 @@ namespace OpenSim { m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); } - break; + break; case "plugin": m_sceneManager.SendCommandToPluginModules(cmdparams); @@ -597,9 +597,9 @@ namespace OpenSim case "users": IList agents = m_sceneManager.GetCurrentSceneAvatars(); - + m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); - + m_console.Notice( String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", "Agent ID","Region")); @@ -627,7 +627,7 @@ namespace OpenSim presence.UUID, regionName)); } - + m_console.Notice(""); break; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 11fb5be..e27a003 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP private Dictionary m_defaultAnimations = new Dictionary(); - /* protected variables */ protected static Dictionary PacketHandlers = @@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP Thread.Sleep(2000); - // Shut down timers m_ackTimer.Stop(); m_clientPingTimer.Stop(); @@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event TeleportLocationRequest OnSetStartLocationRequest; public event UpdateAvatarProperties OnUpdateAvatarProperties; - public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateInventoryFolder OnCreateNewInventoryFolder; public event UpdateInventoryFolder OnUpdateInventoryFolder; @@ -937,13 +934,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// /// - public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); } - public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); @@ -3172,7 +3169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) { - + ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; handlerObjectGroupRequest = OnObjectGroupRequest; if (handlerObjectGroupRequest != null) @@ -3185,7 +3182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return true; } - + private bool HandleViewerEffect(IClientAPI sender, Packet Pack) { @@ -3875,7 +3872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - + switch (Pack.Type) { #region Scene/Avatar @@ -5427,10 +5424,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP } break; case PacketType.ParcelReturnObjects: - + ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; - + LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; @@ -5444,10 +5441,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerParcelReturnObjectsRequest != null) { handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); - + } break; - + #endregion #region Estate Packets @@ -5666,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.LandStatRequest: LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; - + handlerLandStatRequest = OnLandStatRequest; if (handlerLandStatRequest != null) { @@ -5678,7 +5675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts //lsrp.RequestData.RequestFlags; //lsrp.RequestData.Filter; - + break; case PacketType.RequestRegionInfo: diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index fb14a35..3786489 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { public class LLPacketQueue : IPullStatsProvider { - private static readonly log4net.ILog m_log + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private bool m_enabled = true; @@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); return; } - + int tResend = -1; int tLand = -1; int tWind = -1; diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 6ecae06..7ddd072 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.DataSnapshot //Register CAPS handler event m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; - + //harbl } @@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); } - public string OnDiscoveryAttempt(string request, string path, string param, + public string OnDiscoveryAttempt(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { //Very static for now, flexible enough to add new formats @@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector"; - + llsd_response.snapshot_resources.Array.Add(llsd_dataurl); string response = LLSDHelpers.SerialiseLLSDReply(llsd_response); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 8216222..9730b02 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { public class ChatModule : IRegionModule, ISimChat { - private static readonly ILog m_log = + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private const int DEBUG_CHANNEL = 2147483647; @@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // Filled in since it's easier than rewriting right now. LLVector3 fromPos = e.Position; - LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); string fromName = e.From; @@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (avatar != null) { fromPos = avatar.AbsolutePosition; - regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); fromName = avatar.Firstname + " " + avatar.Lastname; fromAgentID = e.Sender.AgentId; @@ -151,13 +151,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (e.Channel == DEBUG_CHANNEL) { TrySendChatMessage(presence, fromPos, regionPos, - fromAgentID, fromName, e.Type, + fromAgentID, fromName, e.Type, message, ChatSourceType.Object); } else { TrySendChatMessage(presence, fromPos, regionPos, - fromAgentID, fromName, e.Type, + fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); } }); @@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, - LLUUID fromAgentID, string fromName, ChatTypeEnum type, + LLUUID fromAgentID, string fromName, ChatTypeEnum type, string message, ChatSourceType src) { if (!presence.IsChildAgent) @@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat LLVector3 fromRegionPos = fromPos + regionPos; LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); - + if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || type == ChatTypeEnum.Say && dis > m_saydistance || type == ChatTypeEnum.Shout && dis > m_shoutdistance) @@ -197,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } // TODO: should change so the message is sent through the avatar rather than direct to the ClientView - presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, + presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); } } diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 03f9a88..283551b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { public class IRCBridgeModule : IRegionModule, ISimChat { - private static readonly ILog m_log = + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private const int DEBUG_CHANNEL = 2147483647; @@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.IsBackground = true; } - m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, + m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, m_defaultzone); } } @@ -222,7 +222,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if ((m_irc.Enabled) && (m_irc.Connected)) { m_log.DebugFormat("[IRC] {0} logging on", clientName); - m_irc.PrivMsg(m_irc.Nick, "Sim", + m_irc.PrivMsg(m_irc.Nick, "Sim", String.Format("notices {0} logging on", clientName)); } m_last_new_user = clientName; @@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat m_log.InfoFormat("[IRC]: {0} logging out", clientName); } - if (m_last_new_user == clientName) + if (m_last_new_user == clientName) m_last_new_user = null; } } @@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (!avatar.IsChildAgent) { avatar.ControllingClient.SendChatMessage( - Helpers.StringToField(data["msg"]), + Helpers.StringToField(data["msg"]), 1, // 255, pos, data["nick"], LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); @@ -634,9 +634,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (!avatar.IsChildAgent) { avatar.ControllingClient.SendChatMessage( - Helpers.StringToField(String.Format(format, args)), - 1, //255, - pos, sender, LLUUID.Zero, + Helpers.StringToField(String.Format(format, args)), + 1, //255, + pos, sender, LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2e8a8da..80936f6 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("ParcelVoiceInfoRequest", new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ParcelVoiceInfoRequest(request, path, param, @@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice })); caps.RegisterHandler("ProvisionVoiceAccountRequest", new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ProvisionVoiceAccountRequest(request, path, param, diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index 77f761f..865894e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("ParcelVoiceInfoRequest", new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ParcelVoiceInfoRequest(request, path, param, @@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice })); caps.RegisterHandler("ProvisionVoiceAccountRequest", new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ProvisionVoiceAccountRequest(request, path, param, diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index 27f16a7..7016d1b 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// This module loads and saves OpenSimulator archives /// public class ArchiverModule : IRegionModule, IRegionArchiver - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// @@ -47,51 +47,51 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// /// - private Scene m_scene; - + private Scene m_scene; + public string Name { get { return "ArchiverModule"; } } - + public bool IsSharedModule { get { return false; } } - + public void Initialise(Scene scene, IConfigSource source) { m_scene = scene; - + m_scene.RegisterModuleInterface(this); } - + public void PostInitialise() - { + { } - + public void Close() { } - + public void ArchiveRegion(string savePath) { m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); - + List entities = m_scene.GetEntities(); - + foreach (EntityBase entity in entities) { - + } - - string serEntities = SerializeObjects(entities); - + + string serEntities = SerializeObjects(entities); + if (serEntities != null && serEntities.Length > 0) { m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); } } - + public void DearchiveRegion(string loadPath) { m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); } - + /// /// Get an xml representation of the given scene objects. /// @@ -115,8 +115,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver serialization += serObject; serialization += ""; - + return serialization; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs index 485cf02..b949666 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs @@ -28,7 +28,7 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Archiver -{ +{ /// /// Interface to region archive functionality /// @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// void ArchiveRegion(string savePath); - + /// /// Dearchive the given region archive into the scene /// diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 2f4f971..f5b1a1d 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land if (obj.OwnerID == owners[i]) objlist.Add(obj); } - } + } catch (InvalidOperationException) { m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr."); @@ -751,7 +751,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land landData.ownerPrims = 0; landData.otherPrims = 0; landData.selectedPrims = 0; - + lock (primsOverMe) primsOverMe.Clear(); @@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land public void addPrimToCount(SceneObjectGroup obj) { - + LLUUID prim_owner = obj.OwnerID; int prim_count = obj.PrimCount; diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index d6e905b..0405bdf 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -1448,12 +1448,12 @@ namespace OpenSim.Region.Environment.Scenes Entities.Add(copy.UUID, copy); } - // Since we copy from a source group that is in selected - // state, but the copy is shown deselected in the viewer, - // We need to clear the selection flag here, else that - // prim never gets persisted at all. The client doesn't - // think it's selected, so it will never send a deselect... - copy.IsSelected=false; + // Since we copy from a source group that is in selected + // state, but the copy is shown deselected in the viewer, + // We need to clear the selection flag here, else that + // prim never gets persisted at all. The client doesn't + // think it's selected, so it will never send a deselect... + copy.IsSelected = false; m_numPrim++; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 4d19d72..f27d0ab 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes } } - + /// /// Called when an object is removed from the environment into inventory. /// @@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) { DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; - + LLUUID folderID = LLUUID.Zero; foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) @@ -1128,7 +1128,7 @@ namespace OpenSim.Region.Environment.Scenes else if (DeRezPacket.AgentBlock.Destination == 6) //Delete { - permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); + permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); } else if (DeRezPacket.AgentBlock.Destination == 9) //Return @@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes DeleteSceneObject(objectGroup); } } - } + } } public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) @@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes } group.ResetIDs(); - + AddSceneObject(group); // if attachment we set it's asset id so object updates can reflect that @@ -1583,7 +1583,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + return null; } @@ -1606,7 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes return null; } group.ResetIDs(); - + AddSceneObject(group); // Set the startup parameter for on_rez event and llGetStartParameter() function @@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Environment.Scenes if (returnobjects.Length <= 0) return false; - // for the moment we're going to store them individually.. however, in the future, the rezObject + // for the moment we're going to store them individually.. however, in the future, the rezObject // will be able to have more items. //string returnstring = ""; @@ -1684,9 +1684,9 @@ namespace OpenSim.Region.Environment.Scenes // returnstring += grp.ToXmlString2(); //} //returnstring += "\n"; - - + + bool permissionToDelete = false; @@ -1697,7 +1697,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo == null) { CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID); - + } if (userInfo != null) { @@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes returningavatar.ControllingClient.SendAlertMessage(message); } return false; - } + } return true; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1e88018..27431ed 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes private int m_incrementsof15seconds = 0; private volatile bool m_backingup = false; - protected string m_simulatorVersion = "unknown"; + protected string m_simulatorVersion = "unknown"; protected ModuleLoader m_moduleLoader; protected StorageManager m_storageManager; @@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, - ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, + ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) { m_config = config; @@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes m_statsReporter.SetObjectCapacity(objectCapacity); m_simulatorVersion = simulatorVersion - + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); } @@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Add an object into the scene that has come from storage /// - /// + /// public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) { m_innerScene.AddSceneObjectFromStorage(sceneObject); @@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes public void AddSceneObject(SceneObjectGroup sceneObject) { m_innerScene.AddSceneObject(sceneObject); - } + } /// /// Delete this object from the scene. @@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes public void DeleteSceneObject(SceneObjectGroup group) { SceneObjectPart rootPart = (group).GetChildPart(group.UUID); - + if (rootPart.PhysActor != null) { PhysicsScene.RemovePrim(rootPart.PhysActor); rootPart.PhysActor = null; - } + } if (UnlinkSceneObject(group.UUID)) { EventManager.TriggerObjectBeingRemovedFromScene(group); EventManager.TriggerParcelPrimCountTainted(); - } + } - group.DeleteGroup(); + group.DeleteGroup(); group.DeleteParts(); // In case anybody else retains a reference to this group, signal deletion by changing the name @@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes // conditions where a user deletes an entity while it is being stored. Really, the update // code needs a redesign. group.Name = null; - } - + } + /// /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the /// object itself is not destroyed. @@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes /// /// true if the object was in the scene, false if it was not public bool UnlinkSceneObject(LLUUID uuid) - { + { if (m_innerScene.DeleteSceneObject(uuid)) { m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); - + return true; } - + return false; } @@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes { m_sceneXmlLoader.SavePrimsToXml2(fileName); } - + /// /// Load a prim archive into the scene. This loads both prims and their assets. /// @@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes IRegionArchiver archiver = RequestModuleInterface(); archiver.DearchiveRegion(filePath); } - + /// /// Save the prims in the scene to an archive. This saves both prims and their assets. /// @@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) { - + AvatarAppearance appearance = null; GetAvatarAppearance(client, out appearance); diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index eae041b..66174bf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes { CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); } - + /// /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format /// @@ -188,12 +188,12 @@ namespace OpenSim.Region.Environment.Scenes /// /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene - /// + /// public void LoadCurrentSceneFromXml2(string filename) { CurrentOrFirstScene.LoadPrimsFromXml2(filename); } - + /// /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets /// as well as the details of the prims themselves. @@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Scenes { CurrentOrFirstScene.SavePrimsToArchive(filename); } - + /// /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload /// their assets to the asset service. diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index cd4be99..2ad01f9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -271,11 +271,11 @@ namespace OpenSim.Region.Environment.Scenes get { return m_rootPart.Text; } set { m_rootPart.Text = value; } } - + protected virtual bool InSceneBackup { get { return true; } - } + } public bool IsSelected { @@ -523,11 +523,11 @@ namespace OpenSim.Region.Environment.Scenes { // m_log.DebugFormat( // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); - + m_scene.EventManager.OnBackup += ProcessBackup; } } - + public LLVector3 GroupScale() { LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); @@ -1079,21 +1079,21 @@ namespace OpenSim.Region.Environment.Scenes /// /// public void ProcessBackup(IRegionDataStore datastore) - { + { // don't backup while it's selected or you're asking for changes mid stream. if (HasGroupChanged) { if ((!IsSelected) && (RootPart != null)) { m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); - + SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); - + datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); HasGroupChanged = false; backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); - + backup_group = null; } // else @@ -1102,10 +1102,10 @@ namespace OpenSim.Region.Environment.Scenes // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); // } } - + // Why is storing the inventory outside of HasGroupChanged? - + //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); } @@ -1192,7 +1192,7 @@ namespace OpenSim.Region.Environment.Scenes dupe.m_regionHandle = m_regionHandle; dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); - + if (userExposed) dupe.m_rootPart.TrimPermissions(); @@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes { SetRootPartOwner(m_rootPart, cAgentID, cGroupID); m_rootPart.ScheduleFullUpdate(); - } + } List partList = new List(m_parts.Values); foreach (SceneObjectPart part in partList) @@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes if (part.UUID != m_rootPart.UUID) { dupe.CopyPart(part, OwnerID, GroupID, userExposed); - + if (userExposed) { SetPartOwner(part, cAgentID, cGroupID); diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 21e650f..19debea 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -1403,10 +1403,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) { - if(remoteAvatar == null) - return; - IClientAPI rc=remoteAvatar.ControllingClient; - if(rc == null) + if (remoteAvatar == null || remoteAvatar.ControllingClient == null) return; remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index e66113d..6d88061 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs @@ -51,10 +51,10 @@ namespace OpenSim.Region.Modules.AvatarFactory public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) { CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); - if ((profile != null) && (profile.RootFolder != null)) + if ((profile != null) && (profile.RootFolder != null)) { appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); - if (appearance != null) + if (appearance != null) { SetAppearanceAssets(profile, ref appearance); m_log.InfoFormat("[APPEARANCE] found : {0}", appearance.ToString()); @@ -182,9 +182,9 @@ namespace OpenSim.Region.Modules.AvatarFactory } } SetAppearanceAssets(profile, ref avatAppearance); - + m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); - avatar.Appearance = avatAppearance; + avatar.Appearance = avatAppearance; } else { @@ -200,7 +200,7 @@ namespace OpenSim.Region.Modules.AvatarFactory } public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) - { + { m_scene.CommsManager.UserService.UpdateUserAppearance(user, appearance); } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index fbfb400..9446844 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -3298,8 +3298,11 @@ namespace OpenSim.Region.ScriptEngine.Common result.Add(src.Substring(start,length).Trim()); start += length+1; length = 0; - } else + } + else + { length++; + } break; default : length++; @@ -5301,7 +5304,8 @@ namespace OpenSim.Region.ScriptEngine.Common { // not present at all active[j] = false; - } else + } + else { // present and correct if (offset[j] < offset[best]) @@ -5329,10 +5333,11 @@ namespace OpenSim.Region.ScriptEngine.Common tokens.Add(src.Substring(beginning,offset[best]-beginning)); - if (best