From 64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 13 Jun 2008 00:21:53 +0000
Subject: Update svn properties, clean up formatting, refactor out duplicate
hard-coded port numbers.
---
OpenSim/Region/Environment/Scenes/InnerScene.cs | 8 ++--
OpenSim/Region/Environment/Scenes/Scene.cs | 46 ++++++----------------
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 25 +++++-------
3 files changed, 25 insertions(+), 54 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index d09efd8..9bbfc3d 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes
{
sceneObject.RegionHandle = m_regInfo.RegionHandle;
sceneObject.SetScene(m_parentScene);
-
+
foreach (SceneObjectPart part in sceneObject.Children.Values)
{
part.LocalId = m_parentScene.PrimIDAllocate();
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Scenes
///
///
///
- /// If true, the object is made persistent into the scene.
+ /// If true, the object is made persistent into the scene.
/// If false, the object will not persist over server restarts
///
/// true if the object was added, false if an object with the same uuid was already in the scene
@@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Scenes
// QuadTree.AddSceneObject(sceneObject);
Entities.Add(sceneObject.UUID, sceneObject);
m_numPrim += sceneObject.Children.Count;
-
+
if (attachToBackup)
- sceneObject.AttachToBackup();
+ sceneObject.AttachToBackup();
return true;
}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 95d6f1f..e70fbe2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -998,7 +998,7 @@ namespace OpenSim.Region.Environment.Scenes
// Cannot create a map for a nonexistant heightmap yet.
if (Heightmap == null)
return;
-
+
if (terrain == null)
{
int tc = System.Environment.TickCount;
@@ -1122,12 +1122,9 @@ namespace OpenSim.Region.Environment.Scenes
mapbmp.SetPixel(x, (256 - y) - 1, black);
}
}
-
}
//}
-
-
//tc = System.Environment.TickCount - tc;
//m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
}
@@ -1135,7 +1132,6 @@ namespace OpenSim.Region.Environment.Scenes
bool drawPrimVolume = true;
-
try
{
IConfig startupConfig = m_config.Configs["Startup"];
@@ -1145,7 +1141,6 @@ namespace OpenSim.Region.Environment.Scenes
{
m_log.Warn("Failed to load StarupConfg");
}
-
if (drawPrimVolume)
{
@@ -1168,8 +1163,8 @@ namespace OpenSim.Region.Environment.Scenes
// Draw if the object is at least 1 meter wide in any direction
if (part.Scale.X > 1f || part.Scale.Y > 1f || part.Scale.Z > 1f)
{
- // Try to get the RGBA of the default texture entry..
- //
+ // Try to get the RGBA of the default texture entry..
+ //
try
{
LLColor texcolor = part.Shape.Textures.DefaultTexture.RGBA;
@@ -1177,9 +1172,7 @@ namespace OpenSim.Region.Environment.Scenes
int colorg = 255 - (int)(texcolor.G * 255f);
int colorb = 255 - (int)(texcolor.B * 255f);
- if (colorr == 255 && colorg == 255 && colorb == 255)
- { }
- else
+ if (!(colorr == 255 && colorg == 255 && colorb == 255))
{
//Try to set the map spot color
try
@@ -1248,10 +1241,9 @@ namespace OpenSim.Region.Environment.Scenes
|| mapdrawendY > 255)
continue;
-
int wy = 0;
- bool breakYN = false; // If we run into an error drawing, break out of the
+ bool breakYN = false; // If we run into an error drawing, break out of the
// loop so we don't lag to death on error handling
for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
{
@@ -1274,7 +1266,7 @@ namespace OpenSim.Region.Environment.Scenes
if (breakYN)
break;
- }
+ }
} // Object is within 256m Z of terrain
} // object is at least a meter wide
} // loop over group children
@@ -1304,7 +1296,6 @@ namespace OpenSim.Region.Environment.Scenes
asset.Type = 0;
asset.Temporary = temporary;
AssetCache.AddAsset(asset);
-
}
else
{
@@ -1322,7 +1313,6 @@ namespace OpenSim.Region.Environment.Scenes
AssetCache.AddAsset(asset);
}
}
-
}
#endregion
@@ -1442,10 +1432,8 @@ namespace OpenSim.Region.Environment.Scenes
// Un-offset the prim (it gets offset later by the consumer method)
pos.Z -= 0.25F;
-
}
-
return pos;
}
else
@@ -1523,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes
// case... other tree types
// tree.Scale = new LLVector3(?, ?, ?);
// break;
-
+
default:
tree.Scale = new LLVector3(4, 4, 4);
break;
@@ -1557,7 +1545,7 @@ namespace OpenSim.Region.Environment.Scenes
///
///
///
- /// If true, the object is made persistent into the scene.
+ /// If true, the object is made persistent into the scene.
/// If false, the object will not persist over server restarts
///
public void AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
@@ -1889,11 +1877,9 @@ namespace OpenSim.Region.Environment.Scenes
client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay;
client.OnUpdatePrimFlags += m_innerScene.UpdatePrimFlags;
client.OnRequestObjectPropertiesFamily += m_innerScene.RequestObjectPropertiesFamily;
-
client.OnRequestGodlikePowers += handleRequestGodlikePowers;
client.OnGodKickUser += HandleGodlikeKickUser;
client.OnObjectPermissions += HandleObjectPermissionsUpdate;
-
client.OnCreateNewInventoryItem += CreateNewInventoryItem;
client.OnCreateNewInventoryFolder += CommsManager.UserProfileCacheService.HandleCreateInventoryFolder;
client.OnUpdateInventoryFolder += CommsManager.UserProfileCacheService.HandleUpdateInventoryFolder;
@@ -1907,29 +1893,23 @@ namespace OpenSim.Region.Environment.Scenes
client.OnRemoveInventoryItem += RemoveInventoryItem;
client.OnRemoveInventoryFolder += RemoveInventoryFolder;
client.OnRezScript += RezScript;
-
client.OnRequestTaskInventory += RequestTaskInventory;
client.OnRemoveTaskItem += RemoveTaskInventory;
client.OnUpdateTaskInventory += UpdateTaskInventory;
client.OnMoveTaskItem += MoveTaskInventoryItem;
-
client.OnGrabObject += ProcessObjectGrab;
client.OnDeGrabObject += ProcessObjectDeGrab;
client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
client.OnParcelBuy += ProcessParcelBuy;
client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
client.OnPacketStats += AddPacketStats;
-
client.OnObjectIncludeInSearch += m_innerScene.MakeObjectSearchable;
-
client.OnTeleportHomeRequest += TeleportClientHome;
-
client.OnSetStartLocationRequest += SetHomeRezPoint;
client.OnUndo += m_innerScene.HandleUndo;
client.OnObjectGroupRequest += m_innerScene.HandleObjectGroupUpdate;
client.OnParcelReturnObjectsRequest += LandChannel.ReturnObjectsInParcel;
client.OnScriptReset += ProcessScriptReset;
-
// EventManager.TriggerOnNewClient(client);
}
@@ -1947,8 +1927,8 @@ namespace OpenSim.Region.Environment.Scenes
}
public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID,
- LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
- bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
+ LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
+ bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates)
{
LLVector3 pos;
const bool frontFacesOnly = true;
@@ -1958,7 +1938,6 @@ namespace OpenSim.Region.Environment.Scenes
if (target != null && target2 != null)
{
-
LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);
Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z);
Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
@@ -1991,10 +1970,9 @@ namespace OpenSim.Region.Environment.Scenes
ScaleOffset = Math.Abs(ScaleOffset);
LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);
LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
- LLVector3 offset = (normal * (ScaleOffset / 2f));
- pos = (intersectionpoint + offset);
+ LLVector3 offset = normal * (ScaleOffset / 2f);
+ pos = intersectionpoint + offset;
-
// stick in offset format from the original prim
pos = pos - target.ParentGroup.AbsolutePosition;
if (CopyRotates)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2774a45..f6dc8a2 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes
RegisterToEvents();
SetDirectionVectors();
-
+
}
public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
@@ -481,8 +481,6 @@ namespace OpenSim.Region.Environment.Scenes
// }
}
-
-
public uint GenerateClientFlags(LLUUID ObjectID)
{
return m_scene.ExternalChecks.ExternalChecksGenerateClientFlags(m_uuid, ObjectID);
@@ -590,27 +588,27 @@ namespace OpenSim.Region.Environment.Scenes
// m_log.DebugFormat(
// "[SCENE PRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2} at pos {3}",
// Name, UUID, m_scene.RegionInfo.RegionName, pos);
-
+
if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0)
{
LLVector3 emergencyPos = new LLVector3(128, 128, 128);
-
+
m_log.WarnFormat(
- "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
+ "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
pos, Name, UUID, emergencyPos);
-
+
pos = emergencyPos;
- }
+ }
m_isChildAgent = false;
-
+
float localAVHeight = 1.56f;
if (m_avHeight != 127.0f)
{
localAVHeight = m_avHeight;
}
- float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y);
+ float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y);
float newPosZ = posZLimit + localAVHeight;
if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
{
@@ -789,7 +787,7 @@ namespace OpenSim.Region.Environment.Scenes
// Must check for standing up even when PhysicsActor is null,
// since sitting currently removes avatar from physical scene
//m_log.Debug("agentPos:" + AbsolutePosition.ToString());
-
+
// This is irritating. Really.
if (!AbsolutePosition.IsFinite())
{
@@ -969,8 +967,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
-
m_scene.EventManager.TriggerOnClientMovement(this);
m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
@@ -1006,7 +1002,6 @@ namespace OpenSim.Region.Environment.Scenes
//m_log.Debug("[AUTOPILOT]: " + Util.GetDistanceTo(AbsolutePosition, m_autoPilotTarget).ToString());
if (Util.GetDistanceTo(AbsolutePosition, m_autoPilotTarget) <= 1.5)
{
-
if (m_sitAtAutoTarget)
{
SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetUUID);
@@ -2140,7 +2135,6 @@ namespace OpenSim.Region.Environment.Scenes
m_log.Info("[CLIENT]: Couldn't save attachments. :(");
}
m_attachments.Clear();
-
}
}
lock (m_knownPrimUUID)
@@ -2204,7 +2198,6 @@ namespace OpenSim.Region.Environment.Scenes
m_attachmentsTransported = true;
lock (m_attachments)
{
-
foreach (SceneObjectGroup gobj in m_attachments)
{
// If the prim group is null then something must have happened to it!
--
cgit v1.1