aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2011-11-01 23:54:09 +0000
committerMelanie2011-11-01 23:54:09 +0000
commitb69f679122fb7fdc0f77fc198e148f42797a2eef (patch)
treee06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/OptionalModules
parentMerge branch 'master' into bigmerge (diff)
parentRemoved see_into_this_sim_from_neighbor configuration option. (diff)
downloadopensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip
opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz
opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2
opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index 2cef8a9..f8120aa 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -98,7 +98,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
98 "Show appearance information for each avatar in the simulator.", 98 "Show appearance information for each avatar in the simulator.",
99 "At the moment this actually just checks that we have all the required baked textures. If not, then appearance is 'corrupt' and other avatars will continue to see a cloud.", 99 "At the moment this actually just checks that we have all the required baked textures. If not, then appearance is 'corrupt' and other avatars will continue to see a cloud.",
100 ShowAppearanceInfo); 100 ShowAppearanceInfo);
101 } 101
102 scene.AddCommand(
103 this, "appearance send",
104 "appearance send",
105 "Send appearance data for each avatar in the simulator to viewers.",
106 SendAppearance);
107 }
108
109 private void SendAppearance(string module, string[] cmd)
110 {
111 lock (m_scenes)
112 {
113 foreach (Scene scene in m_scenes.Values)
114 {
115 scene.ForEachRootScenePresence(sp => scene.AvatarFactory.SendAppearance(sp.UUID));
116 }
117 }
118 }
102 119
103 protected void ShowAppearanceInfo(string module, string[] cmd) 120 protected void ShowAppearanceInfo(string module, string[] cmd)
104 { 121 {