aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b84c3d5..b3b6cbc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3079,7 +3079,7 @@ namespace OpenSim.Region.Framework.Scenes
3079 if (aCircuit == null) 3079 if (aCircuit == null)
3080 { 3080 {
3081 m_log.DebugFormat("[APPEARANCE] Client did not supply a circuit. Non-Linden? Creating default appearance."); 3081 m_log.DebugFormat("[APPEARANCE] Client did not supply a circuit. Non-Linden? Creating default appearance.");
3082 appearance = new AvatarAppearance(client.AgentId); 3082 appearance = new AvatarAppearance();
3083 return; 3083 return;
3084 } 3084 }
3085 3085
@@ -3087,7 +3087,7 @@ namespace OpenSim.Region.Framework.Scenes
3087 if (appearance == null) 3087 if (appearance == null)
3088 { 3088 {
3089 m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName); 3089 m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName);
3090 appearance = new AvatarAppearance(client.AgentId); 3090 appearance = new AvatarAppearance();
3091 } 3091 }
3092 } 3092 }
3093 3093
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e121d9..4739f5b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -916,7 +916,7 @@ namespace OpenSim.Region.Framework.Scenes
916 { 916 {
917 m_log.ErrorFormat("[SCENE PRESENCE]: null appearance in MakeRoot in {0}", Scene.RegionInfo.RegionName); 917 m_log.ErrorFormat("[SCENE PRESENCE]: null appearance in MakeRoot in {0}", Scene.RegionInfo.RegionName);
918 // emergency; this really shouldn't happen 918 // emergency; this really shouldn't happen
919 m_appearance = new AvatarAppearance(UUID); 919 m_appearance = new AvatarAppearance();
920 } 920 }
921 921
922 AddToPhysicalScene(isFlying); 922 AddToPhysicalScene(isFlying);
@@ -2651,7 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes
2651// "[SCENE PRESENCE] Send appearance from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); 2651// "[SCENE PRESENCE] Send appearance from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID);
2652 2652
2653 avatar.ControllingClient.SendAppearance( 2653 avatar.ControllingClient.SendAppearance(
2654 m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); 2654 UUID, m_appearance.VisualParams, m_appearance.Texture.GetBytes());
2655 } 2655 }
2656 2656
2657 // Because appearance setting is in a module, we actually need 2657 // Because appearance setting is in a module, we actually need