diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bb820aa..29966f9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2575,7 +2575,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2575 | // only send update from root agents to other clients; children are only "listening posts" | 2575 | // only send update from root agents to other clients; children are only "listening posts" |
2576 | if (IsChildAgent) | 2576 | if (IsChildAgent) |
2577 | { | 2577 | { |
2578 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2578 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
2579 | return; | 2579 | return; |
2580 | } | 2580 | } |
2581 | 2581 | ||
@@ -2632,10 +2632,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2632 | // only send update from root agents to other clients; children are only "listening posts" | 2632 | // only send update from root agents to other clients; children are only "listening posts" |
2633 | if (IsChildAgent) | 2633 | if (IsChildAgent) |
2634 | { | 2634 | { |
2635 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2635 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
2636 | return; | 2636 | return; |
2637 | } | 2637 | } |
2638 | 2638 | ||
2639 | int count = 0; | 2639 | int count = 0; |
2640 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2640 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
2641 | { | 2641 | { |
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 | { |