OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Small fixes to Scene.cs

0.6.0-stable
Adam Frisby 2008-05-02 18:36:41 +00:00
parent 67bbfadc06
commit 776b4cedf6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -973,9 +973,6 @@ namespace OpenSim.Region.Environment.Scenes
Bitmap mapbmp = new Bitmap(256, 256); Bitmap mapbmp = new Bitmap(256, 256);
double[,] hm = Heightmap.GetDoubles(); double[,] hm = Heightmap.GetDoubles();
float heightvalue = 0;
Color prim = Color.FromArgb(120, 120, 120); Color prim = Color.FromArgb(120, 120, 120);
LLVector3 RayEnd = new LLVector3(0, 0, 0); LLVector3 RayEnd = new LLVector3(0, 0, 0);
LLVector3 RayStart = new LLVector3(0, 0, 0); LLVector3 RayStart = new LLVector3(0, 0, 0);
@ -1022,7 +1019,7 @@ namespace OpenSim.Region.Environment.Scenes
//else //else
//{ //{
float tmpval = (float)hm[x, y]; float tmpval = (float)hm[x, y];
heightvalue = (float)hm[x, y]; float heightvalue = (float)hm[x, y];
if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight) if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight)
{ {
@ -1495,7 +1492,7 @@ namespace OpenSim.Region.Environment.Scenes
client.AgentId, RegionInfo.RegionName); client.AgentId, RegionInfo.RegionName);
SubscribeToClientEvents(client); SubscribeToClientEvents(client);
ScenePresence presence = null; ScenePresence presence;
if (m_restorePresences.ContainsKey(client.AgentId)) if (m_restorePresences.ContainsKey(client.AgentId))
{ {
@ -1636,8 +1633,8 @@ namespace OpenSim.Region.Environment.Scenes
bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
{ {
LLVector3 pos = LLVector3.Zero; LLVector3 pos;
bool frontFacesOnly = true; const bool frontFacesOnly = true;
SceneObjectPart target = GetSceneObjectPart(localID); SceneObjectPart target = GetSceneObjectPart(localID);
SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj); SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
@ -1750,12 +1747,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
{ {
ScenePresence avatar = null;
AvatarAppearance appearance; AvatarAppearance appearance;
GetAvatarAppearance(client, out appearance); GetAvatarAppearance(client, out appearance);
avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
if (avatar.IsChildAgent) if (avatar.IsChildAgent)
{ {