diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs index 2f9bb1e..60ae0cb 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |||
@@ -54,43 +54,43 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
54 | private List<Scene> m_scenes = new List<Scene>(); | 54 | private List<Scene> m_scenes = new List<Scene>(); |
55 | 55 | ||
56 | // private IAvatarFactoryModule m_avatarFactory; | 56 | // private IAvatarFactoryModule m_avatarFactory; |
57 | 57 | ||
58 | public string Name { get { return "Appearance Information Module"; } } | 58 | public string Name { get { return "Appearance Information Module"; } } |
59 | 59 | ||
60 | public Type ReplaceableInterface { get { return null; } } | 60 | public Type ReplaceableInterface { get { return null; } } |
61 | 61 | ||
62 | public void Initialise(IConfigSource source) | 62 | public void Initialise(IConfigSource source) |
63 | { | 63 | { |
64 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: INITIALIZED MODULE"); | 64 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: INITIALIZED MODULE"); |
65 | } | 65 | } |
66 | 66 | ||
67 | public void PostInitialise() | 67 | public void PostInitialise() |
68 | { | 68 | { |
69 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: POST INITIALIZED MODULE"); | 69 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: POST INITIALIZED MODULE"); |
70 | } | 70 | } |
71 | 71 | ||
72 | public void Close() | 72 | public void Close() |
73 | { | 73 | { |
74 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: CLOSED MODULE"); | 74 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: CLOSED MODULE"); |
75 | } | 75 | } |
76 | 76 | ||
77 | public void AddRegion(Scene scene) | 77 | public void AddRegion(Scene scene) |
78 | { | 78 | { |
79 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); | 79 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); |
80 | } | 80 | } |
81 | 81 | ||
82 | public void RemoveRegion(Scene scene) | 82 | public void RemoveRegion(Scene scene) |
83 | { | 83 | { |
84 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); | 84 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); |
85 | 85 | ||
86 | lock (m_scenes) | 86 | lock (m_scenes) |
87 | m_scenes.Remove(scene); | 87 | m_scenes.Remove(scene); |
88 | } | 88 | } |
89 | 89 | ||
90 | public void RegionLoaded(Scene scene) | 90 | public void RegionLoaded(Scene scene) |
91 | { | 91 | { |
92 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); | 92 | // m_log.DebugFormat("[APPEARANCE INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); |
93 | 93 | ||
94 | lock (m_scenes) | 94 | lock (m_scenes) |
95 | m_scenes.Add(scene); | 95 | m_scenes.Add(scene); |
96 | 96 | ||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
99 | "show appearance [<first-name> <last-name>]", | 99 | "show appearance [<first-name> <last-name>]", |
100 | "Synonym for 'appearance show'", | 100 | "Synonym for 'appearance show'", |
101 | HandleShowAppearanceCommand); | 101 | HandleShowAppearanceCommand); |
102 | 102 | ||
103 | scene.AddCommand( | 103 | scene.AddCommand( |
104 | "Users", this, "appearance show", | 104 | "Users", this, "appearance show", |
105 | "appearance show [<first-name> <last-name>]", | 105 | "appearance show [<first-name> <last-name>]", |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
222 | } | 222 | } |
223 | 223 | ||
224 | lock (m_scenes) | 224 | lock (m_scenes) |
225 | { | 225 | { |
226 | foreach (Scene scene in m_scenes) | 226 | foreach (Scene scene in m_scenes) |
227 | { | 227 | { |
228 | if (targetNameSupplied) | 228 | if (targetNameSupplied) |
@@ -344,7 +344,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
344 | 344 | ||
345 | if (targetNameSupplied) | 345 | if (targetNameSupplied) |
346 | { | 346 | { |
347 | lock (m_scenes) | 347 | lock (m_scenes) |
348 | { | 348 | { |
349 | foreach (Scene scene in m_scenes) | 349 | foreach (Scene scene in m_scenes) |
350 | { | 350 | { |
@@ -360,12 +360,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
360 | cdt.AddColumn("Name", ConsoleDisplayUtil.UserNameSize); | 360 | cdt.AddColumn("Name", ConsoleDisplayUtil.UserNameSize); |
361 | cdt.AddColumn("Wearables", 2); | 361 | cdt.AddColumn("Wearables", 2); |
362 | 362 | ||
363 | lock (m_scenes) | 363 | lock (m_scenes) |
364 | { | 364 | { |
365 | foreach (Scene scene in m_scenes) | 365 | foreach (Scene scene in m_scenes) |
366 | { | 366 | { |
367 | scene.ForEachRootScenePresence( | 367 | scene.ForEachRootScenePresence( |
368 | sp => | 368 | sp => |
369 | { | 369 | { |
370 | int count = 0; | 370 | int count = 0; |
371 | 371 | ||
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
428 | 428 | ||
429 | uuidGatherer.AddForInspection(wi.AssetID); | 429 | uuidGatherer.AddForInspection(wi.AssetID); |
430 | uuidGatherer.GatherAll(); | 430 | uuidGatherer.GatherAll(); |
431 | string[] assetStrings | 431 | string[] assetStrings |
432 | = Array.ConvertAll<UUID, string>(uuidGatherer.GatheredUuids.Keys.ToArray(), u => u.ToString()); | 432 | = Array.ConvertAll<UUID, string>(uuidGatherer.GatheredUuids.Keys.ToArray(), u => u.ToString()); |
433 | 433 | ||
434 | bool[] existChecks = scene.AssetService.AssetsExist(assetStrings); | 434 | bool[] existChecks = scene.AssetService.AssetsExist(assetStrings); |
@@ -438,10 +438,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
438 | cdt.AddColumn("Type", 10); | 438 | cdt.AddColumn("Type", 10); |
439 | cdt.AddColumn("UUID", ConsoleDisplayUtil.UuidSize); | 439 | cdt.AddColumn("UUID", ConsoleDisplayUtil.UuidSize); |
440 | cdt.AddColumn("Found", 5); | 440 | cdt.AddColumn("Found", 5); |
441 | 441 | ||
442 | for (int k = 0; k < existChecks.Length; k++) | 442 | for (int k = 0; k < existChecks.Length; k++) |
443 | cdt.AddRow( | 443 | cdt.AddRow( |
444 | (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])], | 444 | (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])], |
445 | assetStrings[k], existChecks[k] ? "yes" : "no"); | 445 | assetStrings[k], existChecks[k] ? "yes" : "no"); |
446 | 446 | ||
447 | sb.Append(cdt.ToString()); | 447 | sb.Append(cdt.ToString()); |