From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 25 May 2008 23:27:38 +0000
Subject: Update svn properties. Formatting cleanup.
---
OpenSim/Region/Environment/Scenes/InnerScene.cs | 12 ++++----
.../Region/Environment/Scenes/Scene.Inventory.cs | 24 +++++++--------
OpenSim/Region/Environment/Scenes/Scene.cs | 34 +++++++++++-----------
OpenSim/Region/Environment/Scenes/SceneManager.cs | 8 ++---
.../Region/Environment/Scenes/SceneObjectGroup.cs | 26 ++++++++---------
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 +---
6 files changed, 53 insertions(+), 56 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index d6e905b..0405bdf 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1448,12 +1448,12 @@ namespace OpenSim.Region.Environment.Scenes
Entities.Add(copy.UUID, copy);
}
- // Since we copy from a source group that is in selected
- // state, but the copy is shown deselected in the viewer,
- // We need to clear the selection flag here, else that
- // prim never gets persisted at all. The client doesn't
- // think it's selected, so it will never send a deselect...
- copy.IsSelected=false;
+ // Since we copy from a source group that is in selected
+ // state, but the copy is shown deselected in the viewer,
+ // We need to clear the selection flag here, else that
+ // prim never gets persisted at all. The client doesn't
+ // think it's selected, so it will never send a deselect...
+ copy.IsSelected = false;
m_numPrim++;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 4d19d72..f27d0ab 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
+
///
/// Called when an object is removed from the environment into inventory.
///
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes
public virtual void DeRezObject(Packet packet, IClientAPI remoteClient)
{
DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet;
-
+
LLUUID folderID = LLUUID.Zero;
foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
@@ -1128,7 +1128,7 @@ namespace OpenSim.Region.Environment.Scenes
else if (DeRezPacket.AgentBlock.Destination == 6) //Delete
{
- permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
+ permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
}
else if (DeRezPacket.AgentBlock.Destination == 9) //Return
@@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes
DeleteSceneObject(objectGroup);
}
}
- }
+ }
}
public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID)
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes
}
group.ResetIDs();
-
+
AddSceneObject(group);
// if attachment we set it's asset id so object updates can reflect that
@@ -1583,7 +1583,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
-
+
return null;
}
@@ -1606,7 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes
return null;
}
group.ResetIDs();
-
+
AddSceneObject(group);
// Set the startup parameter for on_rez event and llGetStartParameter() function
@@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Environment.Scenes
if (returnobjects.Length <= 0)
return false;
- // for the moment we're going to store them individually.. however, in the future, the rezObject
+ // for the moment we're going to store them individually.. however, in the future, the rezObject
// will be able to have more items.
//string returnstring = "";
@@ -1684,9 +1684,9 @@ namespace OpenSim.Region.Environment.Scenes
// returnstring += grp.ToXmlString2();
//}
//returnstring += "\n";
-
-
+
+
bool permissionToDelete = false;
@@ -1697,7 +1697,7 @@ namespace OpenSim.Region.Environment.Scenes
if (userInfo == null)
{
CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID);
-
+
}
if (userInfo != null)
{
@@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes
returningavatar.ControllingClient.SendAlertMessage(message);
}
return false;
- }
+ }
return true;
}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1e88018..27431ed 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
private int m_incrementsof15seconds = 0;
private volatile bool m_backingup = false;
- protected string m_simulatorVersion = "unknown";
+ protected string m_simulatorVersion = "unknown";
protected ModuleLoader m_moduleLoader;
protected StorageManager m_storageManager;
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
- ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
+ ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
{
m_config = config;
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes
m_statsReporter.SetObjectCapacity(objectCapacity);
m_simulatorVersion = simulatorVersion
- + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
+ + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
+ " PhysPrim:" + m_physicalPrim.ToString();
}
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes
///
/// Add an object into the scene that has come from storage
///
- ///
+ ///
public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject)
{
m_innerScene.AddSceneObjectFromStorage(sceneObject);
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddSceneObject(SceneObjectGroup sceneObject)
{
m_innerScene.AddSceneObject(sceneObject);
- }
+ }
///
/// Delete this object from the scene.
@@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes
public void DeleteSceneObject(SceneObjectGroup group)
{
SceneObjectPart rootPart = (group).GetChildPart(group.UUID);
-
+
if (rootPart.PhysActor != null)
{
PhysicsScene.RemovePrim(rootPart.PhysActor);
rootPart.PhysActor = null;
- }
+ }
if (UnlinkSceneObject(group.UUID))
{
EventManager.TriggerObjectBeingRemovedFromScene(group);
EventManager.TriggerParcelPrimCountTainted();
- }
+ }
- group.DeleteGroup();
+ group.DeleteGroup();
group.DeleteParts();
// In case anybody else retains a reference to this group, signal deletion by changing the name
@@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes
// conditions where a user deletes an entity while it is being stored. Really, the update
// code needs a redesign.
group.Name = null;
- }
-
+ }
+
///
/// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the
/// object itself is not destroyed.
@@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes
///
/// true if the object was in the scene, false if it was not
public bool UnlinkSceneObject(LLUUID uuid)
- {
+ {
if (m_innerScene.DeleteSceneObject(uuid))
{
m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
-
+
return true;
}
-
+
return false;
}
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes
{
m_sceneXmlLoader.SavePrimsToXml2(fileName);
}
-
+
///
/// Load a prim archive into the scene. This loads both prims and their assets.
///
@@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes
IRegionArchiver archiver = RequestModuleInterface();
archiver.DearchiveRegion(filePath);
}
-
+
///
/// Save the prims in the scene to an archive. This saves both prims and their assets.
///
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes
protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
{
-
+
AvatarAppearance appearance = null;
GetAvatarAppearance(client, out appearance);
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index eae041b..66174bf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
{
CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset);
}
-
+
///
/// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format
///
@@ -188,12 +188,12 @@ namespace OpenSim.Region.Environment.Scenes
///
/// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene
- ///
+ ///
public void LoadCurrentSceneFromXml2(string filename)
{
CurrentOrFirstScene.LoadPrimsFromXml2(filename);
}
-
+
///
/// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets
/// as well as the details of the prims themselves.
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Scenes
{
CurrentOrFirstScene.SavePrimsToArchive(filename);
}
-
+
///
/// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload
/// their assets to the asset service.
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index cd4be99..2ad01f9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -271,11 +271,11 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_rootPart.Text; }
set { m_rootPart.Text = value; }
}
-
+
protected virtual bool InSceneBackup
{
get { return true; }
- }
+ }
public bool IsSelected
{
@@ -523,11 +523,11 @@ namespace OpenSim.Region.Environment.Scenes
{
// m_log.DebugFormat(
// "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID);
-
+
m_scene.EventManager.OnBackup += ProcessBackup;
}
}
-
+
public LLVector3 GroupScale()
{
LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize);
@@ -1079,21 +1079,21 @@ namespace OpenSim.Region.Environment.Scenes
///
///
public void ProcessBackup(IRegionDataStore datastore)
- {
+ {
// don't backup while it's selected or you're asking for changes mid stream.
if (HasGroupChanged)
{
if ((!IsSelected) && (RootPart != null))
{
m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID);
-
+
SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false);
-
+
datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
HasGroupChanged = false;
backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); });
-
+
backup_group = null;
}
// else
@@ -1102,10 +1102,10 @@ namespace OpenSim.Region.Environment.Scenes
// "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID);
// }
}
-
+
// Why is storing the inventory outside of HasGroupChanged?
-
+
//ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); });
}
@@ -1192,7 +1192,7 @@ namespace OpenSim.Region.Environment.Scenes
dupe.m_regionHandle = m_regionHandle;
dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
-
+
if (userExposed)
dupe.m_rootPart.TrimPermissions();
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes
{
SetRootPartOwner(m_rootPart, cAgentID, cGroupID);
m_rootPart.ScheduleFullUpdate();
- }
+ }
List partList = new List(m_parts.Values);
foreach (SceneObjectPart part in partList)
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes
if (part.UUID != m_rootPart.UUID)
{
dupe.CopyPart(part, OwnerID, GroupID, userExposed);
-
+
if (userExposed)
{
SetPartOwner(part, cAgentID, cGroupID);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 21e650f..19debea 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1403,10 +1403,7 @@ namespace OpenSim.Region.Environment.Scenes
///
public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
{
- if(remoteAvatar == null)
- return;
- IClientAPI rc=remoteAvatar.ControllingClient;
- if(rc == null)
+ if (remoteAvatar == null || remoteAvatar.ControllingClient == null)
return;
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,
--
cgit v1.1