diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Framework/Caps | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Caps')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 48 |
1 files changed, 24 insertions, 24 deletions
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 | |||
47 | { | 47 | { |
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")] | 48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")] |
49 | public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule | 49 | public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | private string m_showCapsCommandFormat = " {0,-38} {1,-60}\n"; | 53 | private string m_showCapsCommandFormat = " {0,-38} {1,-60}\n"; |
54 | 54 | ||
55 | protected Scene m_scene; | 55 | protected Scene m_scene; |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Each agent has its own capabilities handler. | 58 | /// Each agent has its own capabilities handler. |
59 | /// </summary> | 59 | /// </summary> |
60 | protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>(); | 60 | protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>(); |
61 | 61 | ||
62 | protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>(); | 62 | protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>(); |
63 | 63 | ||
64 | protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds | 64 | protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds |
65 | = new Dictionary<UUID, Dictionary<ulong, string>>(); | 65 | = new Dictionary<UUID, Dictionary<ulong, string>>(); |
66 | 66 | ||
67 | public void Initialise(IConfigSource source) | 67 | public void Initialise(IConfigSource source) |
68 | { | 68 | { |
69 | } | 69 | } |
@@ -101,16 +101,16 @@ namespace OpenSim.Region.CoreModules.Framework | |||
101 | { | 101 | { |
102 | m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this); | 102 | m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this); |
103 | } | 103 | } |
104 | 104 | ||
105 | public void PostInitialise() | 105 | public void PostInitialise() |
106 | { | 106 | { |
107 | } | 107 | } |
108 | 108 | ||
109 | public void Close() {} | 109 | public void Close() {} |
110 | 110 | ||
111 | public string Name | 111 | public string Name |
112 | { | 112 | { |
113 | get { return "Capabilities Module"; } | 113 | get { return "Capabilities Module"; } |
114 | } | 114 | } |
115 | 115 | ||
116 | public Type ReplaceableInterface | 116 | public Type ReplaceableInterface |
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
154 | // new object created below | 154 | // new object created below |
155 | oldCaps.DeregisterHandlers(); | 155 | oldCaps.DeregisterHandlers(); |
156 | 156 | ||
157 | // Better safe ... should not be needed but also | 157 | // Better safe ... should not be needed but also |
158 | // no big deal | 158 | // no big deal |
159 | m_capsObjects.Remove(circuitCode); | 159 | m_capsObjects.Remove(circuitCode); |
160 | } | 160 | } |
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
215 | } | 215 | } |
216 | } | 216 | } |
217 | } | 217 | } |
218 | 218 | ||
219 | public Caps GetCapsForUser(uint circuitCode) | 219 | public Caps GetCapsForUser(uint circuitCode) |
220 | { | 220 | { |
221 | lock (m_capsObjects) | 221 | lock (m_capsObjects) |
@@ -225,10 +225,10 @@ namespace OpenSim.Region.CoreModules.Framework | |||
225 | return m_capsObjects[circuitCode]; | 225 | return m_capsObjects[circuitCode]; |
226 | } | 226 | } |
227 | } | 227 | } |
228 | 228 | ||
229 | return null; | 229 | return null; |
230 | } | 230 | } |
231 | 231 | ||
232 | public void ActivateCaps(uint circuitCode) | 232 | public void ActivateCaps(uint circuitCode) |
233 | { | 233 | { |
234 | lock (m_capsObjects) | 234 | lock (m_capsObjects) |
@@ -246,10 +246,10 @@ namespace OpenSim.Region.CoreModules.Framework | |||
246 | m_capsPaths[agent.AgentID] = agent.CapsPath; | 246 | m_capsPaths[agent.AgentID] = agent.CapsPath; |
247 | 247 | ||
248 | lock (m_childrenSeeds) | 248 | lock (m_childrenSeeds) |
249 | m_childrenSeeds[agent.AgentID] | 249 | m_childrenSeeds[agent.AgentID] |
250 | = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds); | 250 | = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds); |
251 | } | 251 | } |
252 | 252 | ||
253 | public string GetCapsPath(UUID agentId) | 253 | public string GetCapsPath(UUID agentId) |
254 | { | 254 | { |
255 | lock (m_capsPaths) | 255 | lock (m_capsPaths) |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
262 | 262 | ||
263 | return null; | 263 | return null; |
264 | } | 264 | } |
265 | 265 | ||
266 | public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID) | 266 | public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID) |
267 | { | 267 | { |
268 | Dictionary<ulong, string> seeds = null; | 268 | Dictionary<ulong, string> seeds = null; |
@@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.Framework | |||
414 | { | 414 | { |
415 | receivedStats[sp.Name] = reqHandler.RequestsReceived; | 415 | receivedStats[sp.Name] = reqHandler.RequestsReceived; |
416 | handledStats[sp.Name] = reqHandler.RequestsHandled; | 416 | handledStats[sp.Name] = reqHandler.RequestsHandled; |
417 | } | 417 | } |
418 | else | 418 | else |
419 | { | 419 | { |
420 | PollServiceEventArgs pollHandler = null; | 420 | PollServiceEventArgs pollHandler = null; |
421 | if (caps.TryGetPollHandler(capName, out pollHandler)) | 421 | if (caps.TryGetPollHandler(capName, out pollHandler)) |
@@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
454 | Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID); | 454 | Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID); |
455 | 455 | ||
456 | if (caps == null) | 456 | if (caps == null) |
457 | return; | 457 | return; |
458 | 458 | ||
459 | foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values) | 459 | foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values) |
460 | { | 460 | { |
@@ -490,7 +490,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
490 | } | 490 | } |
491 | } | 491 | } |
492 | ); | 492 | ); |
493 | 493 | ||
494 | foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value)) | 494 | foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value)) |
495 | cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]); | 495 | cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]); |
496 | 496 | ||
@@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
559 | capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled)); | 559 | capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled)); |
560 | 560 | ||
561 | foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived)) | 561 | foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived)) |
562 | cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled); | 562 | cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled); |
563 | 563 | ||
564 | sb.Append(cdt.ToString()); | 564 | sb.Append(cdt.ToString()); |
565 | */ | 565 | */ |
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
601 | totalRequestsReceived += handler.RequestsReceived; | 601 | totalRequestsReceived += handler.RequestsReceived; |
602 | totalRequestsHandled += handler.RequestsHandled; | 602 | totalRequestsHandled += handler.RequestsHandled; |
603 | } | 603 | } |
604 | 604 | ||
605 | cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled); | 605 | cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled); |
606 | } | 606 | } |
607 | ); | 607 | ); |