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 --- .../Linden/Caps/EventQueue/EventQueueGetModule.cs | 38 +++++++++++----------- .../Linden/Caps/EventQueue/EventQueueHelper.cs | 14 ++++---- .../Caps/EventQueue/Tests/EventQueueTests.cs | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue') diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index ba3edd6..1feece1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs @@ -74,12 +74,12 @@ namespace OpenSim.Region.ClientStack.Linden private const int SERVER_EQ_TIME_NO_EVENTS = VIEWER_TIMEOUT - (10 * 1000); protected Scene m_scene; - + private Dictionary m_ids = new Dictionary(); private Dictionary> queues = new Dictionary>(); private Dictionary m_AvatarQueueUUIDMapping = new Dictionary(); - + #region INonSharedRegionModule methods public virtual void Initialise(IConfigSource config) { @@ -170,7 +170,7 @@ namespace OpenSim.Region.ClientStack.Linden foreach (KeyValuePair> kvp in queues) { MainConsole.Instance.OutputFormat( - "For agent {0} there are {1} messages queued for send.", + "For agent {0} there are {1} messages queued for send.", kvp.Key, kvp.Value.Count); } } @@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.Linden { if (DebugLevel > 0) m_log.DebugFormat( - "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", + "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName); queues[agentId] = new Queue(); @@ -238,13 +238,13 @@ namespace OpenSim.Region.ClientStack.Linden "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}", avatarID, evMap["message"], m_scene.Name); } - } + } catch (NullReferenceException e) { m_log.Error("[EVENTQUEUE] Caught exception: " + e); return false; } - + return true; } @@ -309,10 +309,10 @@ namespace OpenSim.Region.ClientStack.Linden // push markers to handle old responses still waiting // this will cost at most viewer getting two forced noevents - // even being a new queue better be safe + // even being a new queue better be safe queue.Enqueue(null); queue.Enqueue(null); // one should be enough - + lock (m_AvatarQueueUUIDMapping) { eventQueueGetUUID = UUID.Random(); @@ -336,7 +336,7 @@ namespace OpenSim.Region.ClientStack.Linden { // push markers to handle old responses still waiting // this will cost at most viewer getting two forced noevents - // even being a new queue better be safe + // even being a new queue better be safe queue.Enqueue(null); queue.Enqueue(null); // one should be enough @@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden } public void Drop(UUID requestID, UUID pAgentId) { - // do nothing for now, hope client close will do it + // do nothing for now, hope client close will do it } public Hashtable GetEvents(UUID requestID, UUID pAgentId) @@ -437,7 +437,7 @@ namespace OpenSim.Region.ClientStack.Linden negativeID = true; thisID = -thisID; } - + while (queue.Count > 0) { element = queue.Dequeue(); @@ -477,7 +477,7 @@ namespace OpenSim.Region.ClientStack.Linden // if there where no elements before a marker send a NoEvents if (array.Count == 0) return NoEvents(requestID, pAgentId); - + Hashtable responsedata = new Hashtable(); responsedata["int_response_code"] = 200; responsedata["content_type"] = "application/xml"; @@ -500,7 +500,7 @@ namespace OpenSim.Region.ClientStack.Linden responsedata["http_protocol_version"] = "HTTP/1.0"; return responsedata; } - + public void DisableSimulator(ulong handle, UUID avatarID) { OSD item = EventQueueHelper.DisableSimulator(handle); @@ -518,7 +518,7 @@ namespace OpenSim.Region.ClientStack.Linden } public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath, - ulong regionHandle, int regionSizeX, int regionSizeY) + ulong regionHandle, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}", @@ -528,9 +528,9 @@ namespace OpenSim.Region.ClientStack.Linden Enqueue(item, avatarID); } - public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, + public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, - uint locationID, uint flags, string capsURL, + uint locationID, uint flags, string capsURL, UUID avatarID, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) @@ -560,15 +560,15 @@ namespace OpenSim.Region.ClientStack.Linden uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket) { - OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, - timeStamp, offline, parentEstateID, position, ttl, transactionID, + OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, + timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket); Enqueue(item, toAgent); //m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item); } - public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, + public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave) { OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index 5e0bd71..e1e88ae 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.ClientStack.Linden return BuildEvent("DisableSimulator", llsdBody); } - + public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL, UUID agentID, UUID sessionID, @@ -194,13 +194,13 @@ namespace OpenSim.Region.ClientStack.Linden script.Add("ItemID", OSD.FromUUID(itemID)); script.Add("Running", OSD.FromBoolean(running)); script.Add("Mono", OSD.FromBoolean(mono)); - + OSDArray scriptArr = new OSDArray(); scriptArr.Add(script); - + OSDMap body = new OSDMap(); body.Add("Script", scriptArr); - + return BuildEvent("ScriptRunningReply", body); } @@ -243,7 +243,7 @@ namespace OpenSim.Region.ClientStack.Linden { OSDMap messageParams = new OSDMap(15); messageParams.Add("type", new OSDInteger((int)dialog)); - + OSDArray positionArray = new OSDArray(3); positionArray.Add(OSD.FromReal(position.X)); positionArray.Add(OSD.FromReal(position.Y)); @@ -423,7 +423,7 @@ namespace OpenSim.Region.ClientStack.Linden QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID)); QueryDataMap.Add("ProductSku", OSD.FromInteger(0)); QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price)); - + QueryData.Add(QueryDataMap); } body.Add("QueryData", QueryData); @@ -444,7 +444,7 @@ namespace OpenSim.Region.ClientStack.Linden public static OSD partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod) { - + OSDMap physinfo = new OSDMap(6); physinfo["LocalID"] = localID; physinfo["Density"] = density; diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index 1e629bd..ee3f4f1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs @@ -180,7 +180,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - UUID npcId + UUID npcId = m_npcMod.CreateNPC( "John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance()); -- cgit v1.1