From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../Framework/Caps/CapabilitiesModule.cs | 48 +++++----- .../Framework/DynamicAttributes/DAExampleModule.cs | 30 +++--- .../Framework/DynamicAttributes/DOExampleModule.cs | 24 ++--- .../EntityTransfer/EntityTransferModule.cs | 104 ++++++++++----------- .../EntityTransfer/EntityTransferStateMachine.cs | 12 +-- .../EntityTransfer/HGEntityTransferModule.cs | 46 ++++----- .../Framework/InterfaceCommander/Commander.cs | 20 ++-- .../Framework/InventoryAccess/HGAssetMapper.cs | 8 +- .../InventoryAccess/HGInventoryAccessModule.cs | 16 ++-- .../InventoryAccess/InventoryAccessModule.cs | 78 ++++++++-------- .../InventoryAccess/Tests/HGAssetMapperTests.cs | 8 +- .../Tests/InventoryAccessModuleTests.cs | 62 ++++++------ .../CoreModules/Framework/Library/LibraryModule.cs | 2 +- .../Framework/Library/LocalInventoryService.cs | 4 +- .../Framework/Monitoring/MonitorModule.cs | 8 +- .../Framework/Search/BasicSearchModule.cs | 2 +- .../ServiceThrottle/ServiceThrottleModule.cs | 2 +- .../Statistics/Logging/BinaryLoggingModule.cs | 24 ++--- .../UserManagement/HGUserManagementModule.cs | 10 +- .../Tests/HGUserManagementModuleTests.cs | 2 +- .../UserManagement/UserManagementModule.cs | 4 +- 21 files changed, 257 insertions(+), 257 deletions(-) (limited to 'OpenSim/Region/CoreModules/Framework') diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index 386694a..292099d 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs @@ -47,23 +47,23 @@ namespace OpenSim.Region.CoreModules.Framework { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")] public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private string m_showCapsCommandFormat = " {0,-38} {1,-60}\n"; - + protected Scene m_scene; - + /// /// Each agent has its own capabilities handler. /// protected Dictionary m_capsObjects = new Dictionary(); - + protected Dictionary m_capsPaths = new Dictionary(); - protected Dictionary> m_childrenSeeds + protected Dictionary> m_childrenSeeds = new Dictionary>(); - + public void Initialise(IConfigSource source) { } @@ -101,16 +101,16 @@ namespace OpenSim.Region.CoreModules.Framework { m_scene.UnregisterModuleInterface(this); } - - public void PostInitialise() + + public void PostInitialise() { } public void Close() {} - public string Name - { - get { return "Capabilities Module"; } + public string Name + { + get { return "Capabilities Module"; } } public Type ReplaceableInterface @@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework // new object created below oldCaps.DeregisterHandlers(); - // Better safe ... should not be needed but also + // Better safe ... should not be needed but also // no big deal m_capsObjects.Remove(circuitCode); } @@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework } } } - + public Caps GetCapsForUser(uint circuitCode) { lock (m_capsObjects) @@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Framework return m_capsObjects[circuitCode]; } } - + return null; } - + public void ActivateCaps(uint circuitCode) { lock (m_capsObjects) @@ -246,10 +246,10 @@ namespace OpenSim.Region.CoreModules.Framework m_capsPaths[agent.AgentID] = agent.CapsPath; lock (m_childrenSeeds) - m_childrenSeeds[agent.AgentID] + m_childrenSeeds[agent.AgentID] = ((agent.ChildrenCapSeeds == null) ? new Dictionary() : agent.ChildrenCapSeeds); } - + public string GetCapsPath(UUID agentId) { lock (m_capsPaths) @@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Framework return null; } - + public Dictionary GetChildrenSeeds(UUID agentID) { Dictionary seeds = null; @@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.Framework { receivedStats[sp.Name] = reqHandler.RequestsReceived; handledStats[sp.Name] = reqHandler.RequestsHandled; - } - else + } + else { PollServiceEventArgs pollHandler = null; if (caps.TryGetPollHandler(capName, out pollHandler)) @@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID); if (caps == null) - return; + return; foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values) { @@ -490,7 +490,7 @@ namespace OpenSim.Region.CoreModules.Framework } } ); - + foreach (KeyValuePair kvp in receivedStats.OrderByDescending(kp => kp.Value)) cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]); @@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Framework capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled)); foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived)) - cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled); + cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled); sb.Append(cdt.ToString()); */ @@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework totalRequestsReceived += handler.RequestsReceived; totalRequestsHandled += handler.RequestsHandled; } - + cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled); } ); diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs index 0c632b1..d652f43 100644 --- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs @@ -53,12 +53,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule protected Scene m_scene; protected IDialogModule m_dialogMod; - - public string Name { get { return "DAExample Module"; } } - public Type ReplaceableInterface { get { return null; } } + + public string Name { get { return "DAExample Module"; } } + public Type ReplaceableInterface { get { return null; } } public void Initialise(IConfigSource source) {} - + public void AddRegion(Scene scene) { if (ENABLED) @@ -70,22 +70,22 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name); } } - - public void RemoveRegion(Scene scene) + + public void RemoveRegion(Scene scene) { if (ENABLED) { m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove; } } - + public void RegionLoaded(Scene scene) {} - - public void Close() + + public void Close() { RemoveRegion(m_scene); } - + protected bool OnSceneGroupMove(UUID groupId, Vector3 delta) { OSDMap attrs = null; @@ -96,28 +96,28 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs)) attrs = new OSDMap(); - + OSDInteger newValue; // We have to lock on the entire dynamic attributes map to avoid race conditions with serialization code. - lock (sop.DynAttrs) + lock (sop.DynAttrs) { if (!attrs.ContainsKey("moves")) newValue = new OSDInteger(1); else newValue = new OSDInteger(attrs["moves"].AsInteger() + 1); - + attrs["moves"] = newValue; sop.DynAttrs.SetStore(Namespace, StoreName, attrs); } sop.ParentGroup.HasGroupChanged = true; - + string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue); m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg); m_dialogMod.SendGeneralAlert(msg); - + return true; } } diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs index 166a994..3364cbc 100644 --- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs @@ -65,11 +65,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule private Scene m_scene; private IDialogModule m_dialogMod; - public string Name { get { return "DO"; } } - public Type ReplaceableInterface { get { return null; } } + public string Name { get { return "DO"; } } + public Type ReplaceableInterface { get { return null; } } public void Initialise(IConfigSource source) {} - + public void AddRegion(Scene scene) { if (ENABLED) @@ -80,18 +80,18 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule m_dialogMod = m_scene.RequestModuleInterface(); } } - - public void RemoveRegion(Scene scene) + + public void RemoveRegion(Scene scene) { if (ENABLED) { m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove; } } - + public void RegionLoaded(Scene scene) {} - - public void Close() + + public void Close() { RemoveRegion(m_scene); } @@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule rootPart.DynObjs.Add(DAExampleModule.Namespace, Name, new MyObject(movesSoFar)); } - + private bool OnSceneGroupMove(UUID groupId, Vector3 delta) { SceneObjectGroup so = m_scene.GetSceneObjectGroup(groupId); @@ -129,11 +129,11 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule if (rawObj != null) { MyObject myObj = (MyObject)rawObj; - + m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", so.Name, so.UUID, ++myObj.Moves)); } - + return true; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 58d6cf2..6b1eb54 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -72,9 +72,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// If true then we ask the viewer to disable teleport cancellation and ignore teleport requests. /// /// - /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a + /// This is useful in situations where teleport is very likely to always succeed and we want to avoid a /// situation where avatars can be come 'stuck' due to a failed teleport cancellation. Unfortunately, the - /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport + /// nature of the teleport protocol makes it extremely difficult (maybe impossible) to make teleport /// cancellation consistently suceed. /// public bool DisableInterRegionTeleportCancellation { get; set; } @@ -221,12 +221,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer IConfig transferConfig = source.Configs["EntityTransfer"]; if (transferConfig != null) { - DisableInterRegionTeleportCancellation + DisableInterRegionTeleportCancellation = transferConfig.GetBoolean("DisableInterRegionTeleportCancellation", false); WaitForAgentArrivedAtDestination = transferConfig.GetBoolean("wait_for_callback", WaitForAgentArrivedAtDestinationDefault); - + MaxTransferDistance = transferConfig.GetInt("max_distance", DefaultMaxTransferDistance); } else @@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer Scene = scene; - m_interRegionTeleportAttempts = + m_interRegionTeleportAttempts = new Stat( "InterRegionTeleportAttempts", "Number of inter-region teleports attempted.", @@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer null, StatVerbosity.Debug); - m_interRegionTeleportAborts = + m_interRegionTeleportAborts = new Stat( "InterRegionTeleportAborts", "Number of inter-region teleports aborted due to client actions.", @@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer null, StatVerbosity.Debug); - m_interRegionTeleportCancels = + m_interRegionTeleportCancels = new Stat( "InterRegionTeleportCancels", "Number of inter-region teleports cancelled by the client.", @@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer null, StatVerbosity.Debug); - m_interRegionTeleportFailures = + m_interRegionTeleportFailures = new Stat( "InterRegionTeleportFailures", "Number of inter-region teleports that failed due to server/client/network issues.", @@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer public virtual void Close() {} - public virtual void RemoveRegion(Scene scene) + public virtual void RemoveRegion(Scene scene) { if (m_Enabled) { @@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting)) { m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", + "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", client.Name, Scene.Name); } } @@ -672,7 +672,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer sp.ControllingClient.SendTeleportFailed("Agent is already in transit."); return; } - + try { DoTeleportInternal(sp, reg, finalDestination, position, lookAt, teleportFlags); @@ -766,7 +766,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer m_interRegionTeleportAttempts.Value++; m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}", + "[ENTITY TRANSFER MODULE]: {0} transfer protocol version to {1} is {2} / {3}", sp.Scene.Name, finalDestination.RegionName, ctx.OutboundVersion, ctx.InboundVersion); // Fixing a bug where teleporting while sitting results in the avatar ending up removed from @@ -797,7 +797,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo(); agentCircuit.startpos = position; agentCircuit.child = true; - + // agentCircuit.Appearance = sp.Appearance; // agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false); agentCircuit.Appearance = new AvatarAppearance(); @@ -814,7 +814,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } IClientIPEndpoint ipepClient; - + uint newRegionX, newRegionY, oldRegionX, oldRegionY; Util.RegionHandleToRegionLoc(destinationHandle, out newRegionX, out newRegionY); Util.RegionHandleToRegionLoc(sourceRegion.RegionHandle, out oldRegionX, out oldRegionY); @@ -853,7 +853,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (ctx.OutboundVersion >= 0.2f) TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange , ctx, out reason); else - TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason); + TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, ctx, out reason); } private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination, @@ -863,12 +863,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", + "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", sp.Name, Scene.Name, finalDestination.RegionName); string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); - // Let's create an agent there if one doesn't exist yet. + // Let's create an agent there if one doesn't exist yet. // NOTE: logout will always be false for a non-HG teleport. bool logout = false; if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout)) @@ -953,7 +953,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer SetCallbackURL(agent, sp.Scene.RegionInfo); - // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to + // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to // establish th econnection to the destination which makes it return true. if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) { @@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return; } - // A common teleport failure occurs when we can send CreateAgent to the + // A common teleport failure occurs when we can send CreateAgent to the // destination region but the viewer cannot establish the connection (e.g. due to network issues between // the viewer and the destination). In this case, UpdateAgent timesout after 10 seconds, although then // there's a further 10 second wait whilst we attempt to tell the destination to delete the agent in Fail(). @@ -1010,7 +1010,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer capsPath, sp.Scene.RegionInfo.RegionName, sp.Name); // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator, - // where that neighbour simulator could otherwise request a child agent create on the source which then + // where that neighbour simulator could otherwise request a child agent create on the source which then // closes our existing agent which is still signalled as root. sp.IsChildAgent = true; @@ -1071,7 +1071,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer AgentHasMovedAway(sp, logout); sp.HasMovedAway(!(OutSideViewRange || logout)); - + // ulong sourceRegionHandle = sp.RegionHandle; // Now let's make it officially a child agent @@ -1107,7 +1107,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);; - // Let's create an agent there if one doesn't exist yet. + // Let's create an agent there if one doesn't exist yet. // NOTE: logout will always be false for a non-HG teleport. bool logout = false; if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, ctx, out reason, out logout)) @@ -1150,7 +1150,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring); // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator, - // where that neighbour simulator could otherwise request a child agent create on the source which then + // where that neighbour simulator could otherwise request a child agent create on the source which then // closes our existing agent which is still signalled as root. //sp.IsChildAgent = true; @@ -1166,7 +1166,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}", capsPath, sp.Scene.RegionInfo.RegionName, sp.Name); - // Let's send a full update of the agent. + // Let's send a full update of the agent. AgentData agent = new AgentData(); sp.CopyTo(agent,false); agent.Position = agentCircuit.startpos; @@ -1207,7 +1207,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer sp.IsInTransit = false; return; } - + m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); // Need to signal neighbours whether child agents may need closing irrespective of whether this @@ -1248,7 +1248,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // Thread.Sleep(1000); // OK, it got this agent. Let's close everything - // If we shouldn't close the agent due to some other region renewing the connection + // If we shouldn't close the agent due to some other region renewing the connection // then this will be handled in IncomingCloseAgent under lock conditions m_log.DebugFormat( "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name); @@ -1258,7 +1258,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /* else { - // now we have a child agent in this region. + // now we have a child agent in this region. sp.Reset(); } */ @@ -1343,7 +1343,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// /// /// - /// + /// /// now just a HG hook protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) { @@ -1375,7 +1375,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // HG Hook protected virtual bool NeedsClosing(GridRegion reg, bool OutViewRange) - + { return OutViewRange; } @@ -1399,11 +1399,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer remoteClient.SendTeleportFailed("The teleport destination could not be found."); return; } - ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position, + ((Scene)(remoteClient.Scene)).RequestTeleportLocation(remoteClient, info.RegionHandle, lm.Position, Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark)); } - #endregion + #endregion #region Teleport Home @@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer client.SendTeleportFailed("Your home region could not be found."); return false; } - + m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})", client.Name, regionInfo.RegionName, regionInfo.RegionCoordX, regionInfo.RegionCoordY); @@ -1475,7 +1475,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer Scene ascene = agent.Scene; string homeURI = ascene.GetAgentHomeURI(agentID); - + if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position, agent.Scene.GetFormatsOffered(), ctx, out reason)) @@ -1489,7 +1489,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // Given a position relative to the current region and outside of it // find the new region that the point is actually in. - // returns 'null' if new region not found or if information + // returns 'null' if new region not found or if information // and new position relative to it // now only works for crossings @@ -1611,14 +1611,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer Thread.Sleep(10000); m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}", + "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}", agent.Name, regionX, regionY, position, initiatingScene.Name); agent.Scene.RequestTeleportLocation( - agent.ControllingClient, + agent.ControllingClient, Util.RegionGridLocToHandle(regionX, regionY), - position, - agent.Lookat, + position, + agent.Lookat, (uint)Constants.TeleportFlags.ViaLocation); /* @@ -1662,7 +1662,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer icon.EndInvoke(iar); } - + /// /// This Closes child agents on neighbouring regions @@ -1708,7 +1708,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer int ts = Util.EnvironmentTickCount(); try { - AgentData cAgent = new AgentData(); + AgentData cAgent = new AgentData(); agent.CopyTo(cAgent,true); // agent.Appearance.WearableCacheItems = null; @@ -1731,7 +1731,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); m_log.WarnFormat( - "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", + "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", neighbourRegion.RegionName, agent.Name); ReInstantiateScripts(agent); @@ -1827,7 +1827,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return; } - + private void CrossAgentToNewRegionCompleted(IAsyncResult iar) { CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState; @@ -2167,7 +2167,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return false; } } - + private void DoExpiration() { List m_toRemove = new List();; @@ -2179,7 +2179,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (kvp.Value < now) m_toRemove.Add(kvp.Key); } - + if (m_toRemove.Count > 0) { foreach (ulong u in m_toRemove) @@ -2199,7 +2199,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // to find possible regions. return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize); } - + // Given a world position, get the GridRegion info for // the region containing that point. // for compatibility with old grids it does a scan to find large regions @@ -2285,7 +2285,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (newAgent) { // we may already had lost this sp - if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened + if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened return; Scene scene = sp.Scene; @@ -2303,13 +2303,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (regionAccepted) { - // give time for createAgent to finish, since it is async and does grid services access + // give time for createAgent to finish, since it is async and does grid services access Thread.Sleep(500); if (m_eqModule != null) { #region IP Translation for NAT - if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened + if(sp == null || sp.IsDeleted || sp.ClientView == null) // something bad already happened return; IClientIPEndpoint ipepClient; @@ -2344,7 +2344,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer reg.RegionName, sp.Name, sp.UUID, reason); } } - + } /// @@ -2353,7 +2353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// /// /// - /// + /// protected List GetNeighbors(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY) { Scene pScene = avatar.Scene; @@ -2588,7 +2588,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (Scene.RegionInfo.EstateSettings.IsBanned(so.OwnerID)) { m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}", + "[ENTITY TRANSFER MODULE]: Denied prim crossing of {0} {1} into {2} for banned avatar {3}", so.Name, so.UUID, Scene.Name, so.OwnerID); return false; @@ -2600,7 +2600,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (!Scene.AddSceneObject(so)) { m_log.DebugFormat( - "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ", + "[ENTITY TRANSFER MODULE]: Problem adding scene object {0} {1} into {2} ", so.Name, so.UUID, Scene.Name); return false; diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs index acfdaef..0a24555 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs @@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } else { - if (newState == AgentTransferState.Cancelling + if (newState == AgentTransferState.Cancelling && (oldState == AgentTransferState.Preparing || oldState == AgentTransferState.Transferring)) { transitionOkay = true; @@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } if (!transitionOkay) - failureMessage + failureMessage = string.Format( "Agent with ID {0} is not allowed to move from old transit state {1} to new state {2} in {3}", id, oldState, newState, m_mod.Scene.RegionInfo.RegionName); @@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer m_agentsInTransit[id] = newState; // m_log.DebugFormat( -// "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", +// "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", // id, oldState, newState, m_mod.Scene.Name); } else if (failIfNotOkay) @@ -204,11 +204,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // { // if (oldState != null) // m_log.DebugFormat( -// "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", +// "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", // id, oldState, newState, m_mod.Scene.Name); // else // m_log.DebugFormat( -// "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", +// "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", // id, newState, m_mod.Scene.Name); // } } @@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer { if (!m_mod.WaitForAgentArrivedAtDestination) return true; - + lock (m_agentsInTransit) { AgentTransferState? currentState = GetAgentTransferState(id); diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index a9aaf12..4ad500a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs @@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer scene.RegisterModuleInterface(this); //scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject; - m_incomingSceneObjectEngine + m_incomingSceneObjectEngine = new JobEngine( - string.Format("HG Incoming Scene Object Engine ({0})", scene.Name), + string.Format("HG Incoming Scene Object Engine ({0})", scene.Name), "HG INCOMING SCENE OBJECT ENGINE"); StatsManager.RegisterStat( @@ -291,7 +291,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer GridRegion source = new GridRegion(Scene.RegionInfo); source.RawServerURI = m_GatekeeperURI; - + bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason); logout = success; // flag for later logout from this grid; this is an HG TP @@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer break; } - if (!found) + if (!found) { m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i); return false; @@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // // Rez needed npc attachments // Scene.AttachmentsModule.RezAttachments(sp); - + // IAvatarFactoryModule module = Scene.RequestModuleInterface(); // //module.SendAppearance(sp.UUID); // module.RequestRebake(sp, false); @@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // return base.UpdateAgent(reg, finalDestination, agentData, sp); //} - + public override bool TeleportHome(UUID id, IClientAPI client) { m_log.DebugFormat( @@ -449,7 +449,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } // Foreign user wants to go home - // + // AgentCircuitData aCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); if (aCircuit == null || (aCircuit != null && !aCircuit.ServiceURLs.ContainsKey("HomeURI"))) { @@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer { m_log.Debug("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e); } - + if (finalDestination == null) { client.SendTeleportFailed("Your home region could not be found"); @@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } GridRegion homeGatekeeper = MakeRegion(aCircuit); - + m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); @@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer /// public override void RequestTeleportLandmark(IClientAPI remoteClient, AssetLandmark lm) { - m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}", + m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Teleporting agent via landmark to {0} region {1} position {2}", (lm.Gatekeeper == string.Empty) ? "local" : lm.Gatekeeper, lm.RegionID, lm.Position); if (lm.Gatekeeper == string.Empty) @@ -521,7 +521,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer remoteClient, info.RegionHandle, lm.Position, Vector3.Zero, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark)); } - else + else { // Foreign region GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); @@ -581,7 +581,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer jobsRemoved, commonIdToRemove, jobsToReinsert.Count); if (jobsToReinsert.Count > 0) - { + { foreach (JobEngine.Job jobToReinsert in jobsToReinsert) m_incomingSceneObjectEngine.QueueJob(jobToReinsert); } @@ -611,16 +611,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI")) { m_incomingSceneObjectEngine.QueueJob( - string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name), - () => + string.Format("HG UUID Gather for attachment {0} for {1}", so.Name, aCircuit.Name), + () => { string url = aCircuit.ServiceURLs["AssetServerURI"].ToString(); // m_log.DebugFormat( - // "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", + // "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", // so.Name, so.AttachedAvatar, url); IDictionary ids = new Dictionary(); - HGUuidGatherer uuidGatherer + HGUuidGatherer uuidGatherer = new HGUuidGatherer(Scene.AssetService, url, ids); uuidGatherer.AddForInspection(so); @@ -646,7 +646,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer RemoveIncomingSceneObjectJobs(so.OwnerID.ToString()); return; - } + } } // m_log.DebugFormat( @@ -657,7 +657,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer { int tickStart = Util.EnvironmentTickCount(); - uuidGatherer.FetchAsset(kvp.Key); + uuidGatherer.FetchAsset(kvp.Key); int ticksElapsed = Util.EnvironmentTickCountSubtract(tickStart); @@ -670,15 +670,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer RemoveIncomingSceneObjectJobs(so.OwnerID.ToString()); return; - } + } } base.HandleIncomingSceneObject(so, newPosition); // m_log.DebugFormat( - // "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}", + // "[HG ENTITY TRANSFER MODULE]: Completed incoming attachment {0} for HG user {1} with asset server {2}", // so.Name, so.OwnerID, url); - }, + }, so.OwnerID.ToString()); } } @@ -698,7 +698,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer string url = aCircuit.ServiceURLs["HomeURI"].ToString(); IUserAgentService security = new UserAgentServiceConnector(url); return security.VerifyClient(aCircuit.SessionID, token); - } + } else { m_log.DebugFormat( @@ -746,7 +746,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer GridRegion region = new GridRegion(); Uri uri = null; - if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") || + if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") || (aCircuit.ServiceURLs.ContainsKey("HomeURI") && !Uri.TryCreate(aCircuit.ServiceURLs["HomeURI"].ToString(), UriKind.Absolute, out uri))) return null; diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs index b5a4005..63dbb19 100644 --- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs +++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs @@ -41,34 +41,34 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander public class Commander : ICommander { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + /// /// Used in runtime class generation /// private string m_generatedApiClassName; - + public string Name { get { return m_name; } } private string m_name; - + public string Help { get { StringBuilder sb = new StringBuilder(); - + sb.AppendLine("=== " + m_name + " ==="); - + foreach (ICommand com in m_commands.Values) { sb.AppendLine("* " + Name + " " + com.Name + " - " + com.Help); } - + return sb.ToString(); } - } + } /// /// Constructor @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander { m_name = name; m_generatedApiClassName = m_name[0].ToString().ToUpper(); - + if (m_name.Length > 1) m_generatedApiClassName += m_name.Substring(1); } @@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander { get { return m_commands; } } - private Dictionary m_commands = new Dictionary(); + private Dictionary m_commands = new Dictionary(); #region ICommander Members @@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander { if (function != "help") Console.WriteLine("ERROR: Invalid command - No such command exists"); - + Console.Write(Help); } } diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index f54298c..51ae217 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs @@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess { UUID uuid = UUID.Zero; UUID.TryParse(meta.CreatorID, out uuid); - UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid); + UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid); if (creator != null) meta.CreatorID = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName; } @@ -300,8 +300,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess { m_log.Error( string.Format( - "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception ", - asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL), + "[HG ASSET MAPPER]: Failed to post asset {0} (type {1}, length {2}) referenced from {3} to {4} with exception ", + asset.ID, asset.Type, asset.Data.Length, assetID, userAssetURL), e); // For debugging purposes for now we will continue to throw the exception up the stack as was already happening. However, after @@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess else { m_log.DebugFormat( - "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}", + "[HG ASSET MAPPER]: Didn't post asset {0} referenced from {1} because it already exists in asset server {2}", uuid, assetID, userAssetURL); } } diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 4d7c25b..f89e446 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs @@ -91,9 +91,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess if (name == Name) { m_Enabled = true; - + InitialiseCommon(source); - + m_log.InfoFormat("[HG INVENTORY ACCESS MODULE]: {0} enabled.", Name); IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; @@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); m_bypassPermissions = !Util.GetConfigVarFromSections(source, "serverside_object_permissions", - new string[] { "Startup", "Permissions" }, true); + new string[] { "Startup", "Permissions" }, true); } } @@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess } - /// + /// /// CapsUpdateInventoryItemAsset /// public override UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) @@ -268,7 +268,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess return newAssetID; } - /// + /// /// UpdateInventoryItemAsset /// public override bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset) @@ -317,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess RezSelected, RemoveItem, fromTaskID, attachment); } - public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, + public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, UUID groupID, Vector3 RayEnd, Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) @@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess if (!m_CheckSeparateAssets) { if (!UserManagementModule.IsLocalGridUser(userID)) - { // foreign + { // foreign ScenePresence sp = null; if (m_Scene.TryGetScenePresence(userID, out sp)) { @@ -524,7 +524,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess foreach (InventoryItemBase it in content.Items) it.Name = it.Name + " (Unavailable)"; ; - // Send the new names + // Send the new names inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray()); } diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 771e5fe..fcf373b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess return m_UserManagement; } } - + public bool CoalesceMultipleObjectsToInventory { get; set; } #region INonSharedRegionModule @@ -92,14 +92,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess if (name == Name) { m_Enabled = true; - + InitialiseCommon(source); - - m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name); + + m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name); } } } - + /// /// Common module config for both this and descendant classes. /// @@ -107,9 +107,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess protected virtual void InitialiseCommon(IConfigSource source) { IConfig inventoryConfig = source.Configs["Inventory"]; - + if (inventoryConfig != null) - CoalesceMultipleObjectsToInventory + CoalesceMultipleObjectsToInventory = inventoryConfig.GetBoolean("CoalesceMultipleObjectsToInventory", true); else CoalesceMultipleObjectsToInventory = true; @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess if (item != null && item.Owner == ownerID && asset != null) { // m_log.DebugFormat( -// "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", +// "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}", // item.Name, item.ID, asset.ID); item.AssetID = asset.FullID; @@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess List copiedItems = new List(); Dictionary> bundlesToCopy = new Dictionary>(); - + if (CoalesceMultipleObjectsToInventory) { // The following code groups the SOG's by owner. No objects @@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess { if (!bundlesToCopy.ContainsKey(g.OwnerID)) bundlesToCopy[g.OwnerID] = new List(); - + bundlesToCopy[g.OwnerID].Add(g); } } @@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess { List bundle = new List(); bundle.Add(g); - bundlesToCopy[g.UUID] = bundle; + bundlesToCopy[g.UUID] = bundle; } } @@ -384,10 +384,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess // with distinct destinations as well. foreach (List bundle in bundlesToCopy.Values) copiedItems.Add(CopyBundleToInventory(action, folderID, bundle, remoteClient, asAttachment)); - + return copiedItems; } - + /// /// Copy a bundle of objects to inventory. If there is only one object, then this will create an object /// item. If there are multiple objects then these will be saved as a single coalesced item. @@ -408,7 +408,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess Dictionary originalRotations = new Dictionary(); // this possible is not needed if keyframes are saved Dictionary originalKeyframes = new Dictionary(); - + foreach (SceneObjectGroup objectGroup in objlist) { if (objectGroup.RootPart.KeyframeMotion != null) @@ -457,7 +457,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess (uint)PermissionMask.Export); objectGroup.RootPart.NextOwnerMask |= (uint)PermissionMask.Move; - + coa.Add(objectGroup); } @@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess itemXml = CoalescedSceneObjectsSerializer.ToXml(coa, !asAttachment); else itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment); - + // Restore the position of each group now that it has been stored to inventory. foreach (SceneObjectGroup objectGroup in objlist) { @@ -493,11 +493,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess item.CreatorId = objlist[0].RootPart.CreatorID.ToString(); item.CreatorData = objlist[0].RootPart.CreatorData; - + if (objlist.Count > 1) { item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems; - + // If the objects have different creators then don't specify a creator at all foreach (SceneObjectGroup objectGroup in objlist) { @@ -513,8 +513,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess else { item.SaleType = objlist[0].RootPart.ObjectSaleType; - item.SalePrice = objlist[0].RootPart.SalePrice; - } + item.SalePrice = objlist[0].RootPart.SalePrice; + } AssetBase asset = CreateAsset( objlist[0].GetPartName(objlist[0].RootPart.LocalId), @@ -523,7 +523,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess Utils.StringToBytes(itemXml), objlist[0].OwnerID.ToString()); m_Scene.AssetService.Store(asset); - + item.AssetID = asset.FullID; if (DeRezAction.SaveToExistingUserInventoryItem == action) @@ -562,7 +562,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess // This is a hook to do some per-asset post-processing for subclasses that need that if (remoteClient != null && action != DeRezAction.Delete) ExportAsset(remoteClient.AgentId, asset.FullID); - + return item; } @@ -580,7 +580,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess /// /// protected InventoryItemBase AddPermissions( - InventoryItemBase item, SceneObjectGroup so, List objsForEffectivePermissions, + InventoryItemBase item, SceneObjectGroup so, List objsForEffectivePermissions, IClientAPI remoteClient) { uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7; @@ -614,7 +614,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess item.NextPermissions = perms & so.RootPart.NextOwnerMask; item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask; item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask; - + // apply next owner perms on rez item.CurrentPermissions |= SceneObjectGroup.SLAM; } @@ -642,11 +642,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess 7); // Preserve folded permissions } - //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions); + //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions); return item; } - + /// /// Create an item using details for the given scene object. /// @@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID) { // m_log.DebugFormat( -// "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", +// "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", // so.Name, so.UUID, folderID, action); // // Get the user info of the item destination @@ -707,7 +707,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess // Delete is treated like return in this case // Deleting your own items makes them go to trash // - + InventoryFolderBase folder = null; InventoryItemBase item = null; @@ -723,7 +723,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess m_log.DebugFormat( "[INVENTORY ACCESS MODULE]: Object {0} {1} scheduled for save to inventory has already been deleted.", so.Name, so.UUID); - + return null; } } @@ -805,13 +805,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess } } - item = new InventoryItemBase(); + item = new InventoryItemBase(); item.ID = UUID.Random(); item.InvType = (int)InventoryType.Object; item.Folder = folder.ID; item.Owner = userID; - } - + } + return item; } // compatibility do not use @@ -863,7 +863,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess byte BypassRayCast, bool RayEndIsIntersection, bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) { - AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString()); + AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString()); if (rezAsset == null) { @@ -891,7 +891,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess "[INVENTORY ACCESS MODULE]: missing data in asset {0} to RezObject()", assetID, remoteClient.Name); remoteClient.SendAgentAlertMessage(string.Format("Unable to rez: missing data in asset {0} ", assetID), false); - return null; + return null; } SceneObjectGroup group = null; @@ -903,7 +903,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0); Vector3 pos; - bool single + bool single = m_Scene.GetObjectsToRez( rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight); @@ -1055,7 +1055,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess /// /// true if we can processed with rezzing, false if we need to abort private bool DoPreRezWhenFromItem( - IClientAPI remoteClient, InventoryItemBase item, List objlist, + IClientAPI remoteClient, InventoryItemBase item, List objlist, Vector3 pos, List veclist, bool isAttachment) { UUID fromUserInventoryItemId = UUID.Zero; @@ -1142,7 +1142,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess //Need to kill the for sale here rootPart.ObjectSaleType = 0; rootPart.SalePrice = 10; - + if (m_Scene.Permissions.PropagatePermissions()) { foreach (SceneObjectPart part in so.Parts) @@ -1154,7 +1154,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess part.RezzerID = item.Owner; part.Inventory.ChangeInventoryOwner(item.Owner); } - + so.ApplyNextOwnerPermissions(); // In case the user has changed flags on a received item @@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess { IInventoryService invService = m_Scene.RequestModuleInterface(); InventoryItemBase item = invService.GetItem(agentID, itemID); - + if (item != null && item.CreatorData != null && item.CreatorData != string.Empty) UserManagementModule.AddUser(item.CreatorIdAsUuid, item.CreatorData); diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs index 007ff63..8f12331 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs @@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests scene.StartScripts(); HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl); - UserAccount ua + UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password"); SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail); @@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID"); Assert.NotNull(uuidAttribute); // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task - // item created earlier. + // item created earlier. } private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId) @@ -131,9 +131,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests // immediately for tests rather than chunter through it's threaded mechanisms. AutoResetEvent chatEvent = new AutoResetEvent(false); - scene.EventManager.OnChatFromWorld += (s, c) => + scene.EventManager.OnChatFromWorld += (s, c) => { -// Console.WriteLine("Got chat [{0}]", c.Message); +// Console.WriteLine("Got chat [{0}]", c.Message); chatEvent.Set(); }; diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index b31d4df..de29ae9 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs @@ -48,12 +48,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests { [TestFixture] public class InventoryAccessModuleTests : OpenSimTestCase - { + { protected TestScene m_scene; protected BasicInventoryAccessModule m_iam; protected UUID m_userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); protected TestClient m_tc; - + [SetUp] public override void SetUp() { @@ -68,32 +68,32 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests SceneHelpers sceneHelpers = new SceneHelpers(); m_scene = sceneHelpers.SetupScene(); SceneHelpers.SetupSceneModules(m_scene, config, m_iam); - + // Create user string userFirstName = "Jock"; string userLastName = "Stirrup"; string userPassword = "troll"; - UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword); - + UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword); + AgentCircuitData acd = new AgentCircuitData(); acd.AgentID = m_userId; m_tc = new TestClient(acd, m_scene); } - + [Test] public void TestRezCoalescedObject() { /* TestHelpers.InMethod(); // log4net.Config.XmlConfigurator.Configure(); - + // Create asset SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20); object1.AbsolutePosition = new Vector3(15, 30, 45); - + SceneObjectGroup object2 = SceneHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40); - object2.AbsolutePosition = new Vector3(25, 50, 75); - + object2.AbsolutePosition = new Vector3(25, 50, 75); + CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2); UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); @@ -107,46 +107,46 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests item1.Name = item1Name; item1.AssetID = asset1.FullID; item1.ID = item1Id; - InventoryFolderBase objsFolder + InventoryFolderBase objsFolder = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0]; item1.Folder = objsFolder.ID; item1.Flags |= (uint)InventoryItemFlags.ObjectHasMultipleItems; m_scene.AddInventoryItem(item1); - - SceneObjectGroup so + + SceneObjectGroup so = m_iam.RezObject( - m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false); - + m_tc, item1Id, new Vector3(100, 100, 100), Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false); + Assert.That(so, Is.Not.Null); - + Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(2)); - + SceneObjectPart retrievedObj1Part = m_scene.GetSceneObjectPart(object1.Name); Assert.That(retrievedObj1Part, Is.Null); - + retrievedObj1Part = m_scene.GetSceneObjectPart(item1.Name); Assert.That(retrievedObj1Part, Is.Not.Null); Assert.That(retrievedObj1Part.Name, Is.EqualTo(item1.Name)); - + // Bottom of coalescence is placed on ground, hence we end up with 100.5 rather than 85 since the bottom // object is unit square. Assert.That(retrievedObj1Part.AbsolutePosition, Is.EqualTo(new Vector3(95, 90, 100.5f))); - + SceneObjectPart retrievedObj2Part = m_scene.GetSceneObjectPart(object2.Name); - Assert.That(retrievedObj2Part, Is.Not.Null); + Assert.That(retrievedObj2Part, Is.Not.Null); Assert.That(retrievedObj2Part.Name, Is.EqualTo(object2.Name)); Assert.That(retrievedObj2Part.AbsolutePosition, Is.EqualTo(new Vector3(105, 110, 130.5f))); */ - } - + } + [Test] public void TestRezObject() { TestHelpers.InMethod(); // log4net.Config.XmlConfigurator.Configure(); - + // Create asset - SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40); + SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40); UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1); @@ -159,17 +159,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests item1.Name = item1Name; item1.AssetID = asset1.FullID; item1.ID = item1Id; - InventoryFolderBase objsFolder + InventoryFolderBase objsFolder = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0]; item1.Folder = objsFolder.ID; m_scene.AddInventoryItem(item1); - - SceneObjectGroup so + + SceneObjectGroup so = m_iam.RezObject( - m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false); - + m_tc, item1Id, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false); + Assert.That(so, Is.Not.Null); - + SceneObjectPart retrievedPart = m_scene.GetSceneObjectPart(so.UUID); Assert.That(retrievedPart, Is.Not.Null); } diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 862f0b7..df9d4f9 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs @@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library return; // This will never run more than once, even if the region is restarted - if (!m_HasRunOnce) + if (!m_HasRunOnce) { LoadLibrariesFromArchives(); //DumpLibrary(); diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 21e00b2..c1a9457 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs @@ -259,11 +259,11 @@ namespace OpenSim.Region.CoreModules.Framework.Library /// /// Get the union of permissions of all inventory items - /// that hold the given assetID. + /// that hold the given assetID. /// /// /// - /// The permissions or 0 if no such asset is found in + /// The permissions or 0 if no such asset is found in /// the user's inventory public int GetAssetPermissions(UUID userID, UUID assetID) { return 0; } } diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index 93a7cf2..fb3d31c 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs @@ -44,7 +44,7 @@ using Mono.Addins; namespace OpenSim.Region.CoreModules.Framework.Monitoring { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")] - public class MonitorModule : INonSharedRegionModule + public class MonitorModule : INonSharedRegionModule { /// /// Is this module enabled? @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring if (cnfg != null) Enabled = cnfg.GetBoolean("Enabled", true); - + if (!Enabled) return; @@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; }); MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; }); } - + private void UnRegisterStatsManagerRegionStatistics() { foreach (Stat stat in registeredStats) @@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring } registeredStats.Clear(); } - + } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs index 3849996..c04d856 100644 --- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs @@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Framework.Search #endregion ISharedRegionModule - + #region Event Handlers void EventManager_OnMakeRootAgent(ScenePresence sp) diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs index 36fb57a..924a1a3 100644 --- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Framework private readonly List m_scenes = new List(); private JobEngine m_processorJobEngine; - + #region ISharedRegionModule public void Initialise(IConfigSource config) diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs index f3436d1..3e6c8b5 100644 --- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs @@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging public class BinaryLoggingModule : INonSharedRegionModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + protected bool m_collectStats; protected Scene m_scene = null; - + public string Name { get { return "Binary Statistics Logging Module"; } } public Type ReplaceableInterface { get { return null; } } - public void Initialise(IConfigSource source) + public void Initialise(IConfigSource source) { try { @@ -81,23 +81,23 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging // if it doesn't work, we don't collect anything } } - + public void AddRegion(Scene scene) { m_scene = scene; } - - public void RemoveRegion(Scene scene) + + public void RemoveRegion(Scene scene) { } - - public void RegionLoaded(Scene scene) + + public void RegionLoaded(Scene scene) { if (m_collectStats) m_scene.StatsReporter.OnSendStatsResult += LogSimStats; } - - public void Close() + + public void Close() { } @@ -107,12 +107,12 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging public string Path; public System.IO.BinaryWriter Log; } - + static StatLogger m_statLog = null; static TimeSpan m_statLogPeriod = TimeSpan.FromSeconds(300); static string m_statsDir = String.Empty; static Object m_statLockObject = new Object(); - + private void LogSimStats(SimStats stats) { SimStatsPacket pack = new SimStatsPacket(); diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index ea3bbe7..3e0a610 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs @@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement } // This is it! Let's ask the other world - if (words[0].Contains(".")) + if (words[0].Contains(".")) { string[] names = words[0].Split(new char[] { '.' }); if (names.Length >= 2) @@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement } UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uriStr); - + UUID userID = UUID.Zero; try { @@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement { m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e); } - + if (!userID.Equals(UUID.Zero)) { UserData ud = new UserData(); @@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement //{ // foreach (UserData d in m_UserCache.Values) // { - // if (d.LastName.StartsWith("@") && - // (d.FirstName.ToLower().StartsWith(query.ToLower()) || + // if (d.LastName.StartsWith("@") && + // (d.FirstName.ToLower().StartsWith(query.ToLower()) || // d.LastName.ToLower().StartsWith(query.ToLower()))) // users.Add(d); // } diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs index 4e3b7e5..9d91aa3 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests { [TestFixture] public class HGUserManagementModuleTests : OpenSimTestCase - { + { /// /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation. /// diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 2701912..51f973a 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -345,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement } /// - /// + /// /// /// /// Caller please provide a properly instantiated array for names, string[2] @@ -557,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement return ret; // try grid user service - + GridUserInfo[] pinfos = m_Scenes[0].GridUserService.GetGridUserInfo(missing.ToArray()); if(pinfos.Length > 0) { -- cgit v1.1