From 6a1b787436cc59043a26a296781e7a7b5ea0c67b Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 14 May 2008 05:33:32 +0000
Subject: More formatting cleanup.
---
.../Region/ClientStack/LindenUDP/LLClientView.cs | 6 +-
.../Region/ClientStack/LindenUDP/LLPacketQueue.cs | 3 +-
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 65 +++++++++++-----------
.../Region/Environment/Scenes/Scene.Inventory.cs | 6 +-
OpenSim/Region/Environment/Scenes/SceneEvents.cs | 3 +-
OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 +-
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 4 +-
.../Common/ScriptEngineBase/ScriptManager.cs | 11 ++--
.../Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs | 3 +-
9 files changed, 61 insertions(+), 46 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index af20687..32432b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4601,13 +4601,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack;
handlerObjectIncludeInSearch = null;
- foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) {
+ foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData)
+ {
bool inSearch = objData.IncludeInSearch;
uint localID = objData.ObjectLocalID;
handlerObjectIncludeInSearch = OnObjectIncludeInSearch;
- if (handlerObjectIncludeInSearch != null) {
+ if (handlerObjectIncludeInSearch != null)
+ {
handlerObjectIncludeInSearch(this, inSearch, localID);
}
}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index c6da96e..8f90f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return;
}
- lock (this) {
+ lock (this)
+ {
switch (item.throttleType)
{
case ThrottleOutPacketType.Resend:
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 245922c..5831ddc 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -78,43 +78,47 @@ namespace OpenSim.Region.DataSnapshot
if (!m_scenes.Contains(scene))
m_scenes.Add(scene);
- if (!m_configLoaded) {
+ if (!m_configLoaded)
+ {
m_configLoaded = true;
m_log.Info("[DATASNAPSHOT]: Loading configuration");
//Read from the config for options
- lock (m_syncInit) {
- try {
- m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
- if (config.Configs["Startup"].GetBoolean("gridmode", true))
- {
- m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
- m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
- m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
- }
- else
- {
- //Non gridmode stuff
- }
-
- m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
- m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots);
- m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
- m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
- m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
- m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
- //BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default.
- //RESOLUTION: Wontfix, there are no Suiseiseki-loving developers
- String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray());
- foreach (String bloody_wanker in annoying_string_array) {
- m_disabledModules.Add(bloody_wanker);
- }
-
- } catch (Exception) {
+ lock (m_syncInit)
+ {
+ try
+ {
+ m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
+ if (config.Configs["Startup"].GetBoolean("gridmode", true))
+ {
+ m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
+ m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
+ m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
+ }
+ else
+ {
+ //Non gridmode stuff
+ }
+
+ m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
+ m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots);
+ m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
+ m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
+ m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
+ m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
+ //BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default.
+ //RESOLUTION: Wontfix, there are no Suiseiseki-loving developers
+ String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray());
+ foreach (String bloody_wanker in annoying_string_array)
+ {
+ m_disabledModules.Add(bloody_wanker);
+ }
+ }
+ catch (Exception)
+ {
m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled.");
m_enabled = false;
return;
}
-
}
}
if (Directory.Exists(m_snapsDir))
@@ -135,7 +139,6 @@ namespace OpenSim.Region.DataSnapshot
}
}
-
if (m_enabled)
{
m_log.Info("[DATASNAPSHOT]: Scene added to module.");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index efd258d..82a6b94 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -815,7 +815,8 @@ namespace OpenSim.Region.Environment.Scenes
agentItem.Folder = folderId;
agentItem.EveryOnePermissions = taskItem.EveryoneMask;
- if (remoteClient.AgentId != taskItem.OwnerID) {
+ if (remoteClient.AgentId != taskItem.OwnerID)
+ {
agentItem.BasePermissions = taskItem.NextOwnerMask;
agentItem.CurrentPermissions = taskItem.NextOwnerMask;
agentItem.NextPermissions = taskItem.NextOwnerMask;
@@ -1038,7 +1039,8 @@ namespace OpenSim.Region.Environment.Scenes
item.InvType = asset.InvType;
item.Folder = DeRezPacket.AgentBlock.DestinationID;
item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
- if (remoteClient.AgentId != objectGroup.RootPart.OwnerID) {
+ if (remoteClient.AgentId != objectGroup.RootPart.OwnerID)
+ {
item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 88537e9..dacd609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -195,7 +195,8 @@ namespace OpenSim.Region.Environment.Scenes
public int transactiontype;
public string description;
- public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription) {
+ public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription)
+ {
sender = asender;
receiver = areceiver;
amount = aamount;
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 5008927..2e7ec15 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -579,7 +579,8 @@ namespace OpenSim.Region.Physics.Meshing
if (pathShearX != 0)
{
- if (pathShearX > 50) {
+ if (pathShearX > 50)
+ {
// Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
extr.pushX = (((float)(256 - pathShearX) / 100) * -1f);
// m_log.Warn("pushX: " + extr.pushX);
@@ -593,7 +594,8 @@ namespace OpenSim.Region.Physics.Meshing
if (pathShearY != 0)
{
- if (pathShearY > 50) {
+ if (pathShearY > 50)
+ {
// Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
extr.pushY = (((float)(256 - pathShearY) / 100) * -1f);
//m_log.Warn("pushY: " + extr.pushY);
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a54523b..c2a1c8e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void waitForSpaceUnlock(IntPtr space)
{
//if (space != (IntPtr)0)
- //while (d.SpaceLockQuery(space)){ } // Wait and do nothing
+ //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
}
/// <summary>
@@ -952,7 +952,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public void addCollisionEventReporting(PhysicsActor obj)
{
- lock(_collisionEventPrim)
+ lock (_collisionEventPrim)
{
if (!_collisionEventPrim.Contains(obj))
_collisionEventPrim.Add(obj);
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index da30535..2233913 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -207,7 +207,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
public void DoScriptLoadUnload()
{
- lock (LUQueue) {
+ lock (LUQueue)
+ {
if (LUQueue.Count > 0)
{
LUStruct item = LUQueue.Dequeue();
@@ -216,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{
_StopScript(item.localID, item.itemID);
}
- if (item.Action == LUType.Load)
+ else if (item.Action == LUType.Load)
{
_StartScript(item.localID, item.itemID, item.script);
}
@@ -249,7 +250,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
/// <param name="localID"></param>
public void StartScript(uint localID, LLUUID itemID, string Script)
{
- lock(LUQueue) {
+ lock (LUQueue)
+ {
if (LUQueue.Count >= LoadUnloadMaxQueueSize)
{
m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: ERROR: Load/unload queue item count is at " + LUQueue.Count + ". Config variable \"LoadUnloadMaxQueueSize\" is set to " + LoadUnloadMaxQueueSize + ", so ignoring new script.");
@@ -276,7 +278,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
ls.localID = localID;
ls.itemID = itemID;
ls.Action = LUType.Unload;
- lock (LUQueue) {
+ lock (LUQueue)
+ {
LUQueue.Enqueue(ls);
}
}
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
index 7b4a1af..c721267 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
@@ -34,7 +34,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
{
//public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types;
- //LSO_Enums() {
+ //LSO_Enums()
+ //{
// OpCode_Add_Types.Add(51, typeof(String));
// OpCode_Add_Types.Add(17, typeof(UInt32));
//}
--
cgit v1.1