aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7d66bf4..378199c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -973,9 +973,6 @@ namespace OpenSim.Region.Environment.Scenes
973 Bitmap mapbmp = new Bitmap(256, 256); 973 Bitmap mapbmp = new Bitmap(256, 256);
974 double[,] hm = Heightmap.GetDoubles(); 974 double[,] hm = Heightmap.GetDoubles();
975 975
976 float heightvalue = 0;
977
978
979 Color prim = Color.FromArgb(120, 120, 120); 976 Color prim = Color.FromArgb(120, 120, 120);
980 LLVector3 RayEnd = new LLVector3(0, 0, 0); 977 LLVector3 RayEnd = new LLVector3(0, 0, 0);
981 LLVector3 RayStart = new LLVector3(0, 0, 0); 978 LLVector3 RayStart = new LLVector3(0, 0, 0);
@@ -1022,7 +1019,7 @@ namespace OpenSim.Region.Environment.Scenes
1022 //else 1019 //else
1023 //{ 1020 //{
1024 float tmpval = (float)hm[x, y]; 1021 float tmpval = (float)hm[x, y];
1025 heightvalue = (float)hm[x, y]; 1022 float heightvalue = (float)hm[x, y];
1026 1023
1027 if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight) 1024 if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight)
1028 { 1025 {
@@ -1495,7 +1492,7 @@ namespace OpenSim.Region.Environment.Scenes
1495 client.AgentId, RegionInfo.RegionName); 1492 client.AgentId, RegionInfo.RegionName);
1496 1493
1497 SubscribeToClientEvents(client); 1494 SubscribeToClientEvents(client);
1498 ScenePresence presence = null; 1495 ScenePresence presence;
1499 1496
1500 if (m_restorePresences.ContainsKey(client.AgentId)) 1497 if (m_restorePresences.ContainsKey(client.AgentId))
1501 { 1498 {
@@ -1636,8 +1633,8 @@ namespace OpenSim.Region.Environment.Scenes
1636 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) 1633 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
1637 { 1634 {
1638 1635
1639 LLVector3 pos = LLVector3.Zero; 1636 LLVector3 pos;
1640 bool frontFacesOnly = true; 1637 const bool frontFacesOnly = true;
1641 1638
1642 SceneObjectPart target = GetSceneObjectPart(localID); 1639 SceneObjectPart target = GetSceneObjectPart(localID);
1643 SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj); 1640 SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
@@ -1750,12 +1747,10 @@ namespace OpenSim.Region.Environment.Scenes
1750 } 1747 }
1751 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) 1748 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
1752 { 1749 {
1753 ScenePresence avatar = null;
1754
1755 AvatarAppearance appearance; 1750 AvatarAppearance appearance;
1756 GetAvatarAppearance(client, out appearance); 1751 GetAvatarAppearance(client, out appearance);
1757 1752
1758 avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); 1753 ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
1759 1754
1760 if (avatar.IsChildAgent) 1755 if (avatar.IsChildAgent)
1761 { 1756 {