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

Formatting cleanup.

viewer-2-initial-appearance
Jeff Ames 2010-09-12 13:43:49 -04:00
parent 20cd1da6bf
commit f1f0bc23f4
92 changed files with 754 additions and 772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -693,8 +693,6 @@ namespace OpenSim.Data.SQLite
{ {
landaccesslist.Rows.Remove(rowsToDelete[iter]); landaccesslist.Rows.Remove(rowsToDelete[iter]);
} }
} }
Commit(); Commit();
} }
@ -2246,7 +2244,6 @@ namespace OpenSim.Data.SQLite
delete.Parameters.Add(createSqliteParameter("AccessUUID", typeof(String))); delete.Parameters.Add(createSqliteParameter("AccessUUID", typeof(String)));
da.DeleteCommand = delete; da.DeleteCommand = delete;
da.DeleteCommand.Connection = conn; da.DeleteCommand.Connection = conn;
} }
private void setupRegionSettingsCommands(SqliteDataAdapter da, SqliteConnection conn) private void setupRegionSettingsCommands(SqliteDataAdapter da, SqliteConnection conn)

3
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -1691,7 +1691,6 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer."); m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer.");
} }
} }
public void RemoveStreamHandler(string httpMethod, string path) public void RemoveStreamHandler(string httpMethod, string path)
@ -1728,7 +1727,6 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
RemoveHTTPHandler(httpMethod, path); RemoveHTTPHandler(httpMethod, path);
} }
public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler) public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)
@ -1759,7 +1757,6 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
public bool RemoveLLSDHandler(string path, LLSDMethod handler) public bool RemoveLLSDHandler(string path, LLSDMethod handler)
{ {
try try

5
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -288,7 +288,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event GodlikeMessage onGodlikeMessage; public event GodlikeMessage onGodlikeMessage;
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
#endregion Events #endregion Events
#region Class Members #region Class Members
@ -11191,8 +11190,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
outputPacket = false; outputPacket = false;
if (m_debugPacketLevel <= 200 if (m_debugPacketLevel <= 200
&& && (packet.Type == PacketType.ImagePacket
(packet.Type == PacketType.ImagePacket
|| packet.Type == PacketType.ImageData || packet.Type == PacketType.ImageData
|| packet.Type == PacketType.LayerData || packet.Type == PacketType.LayerData
|| packet.Type == PacketType.CoarseLocationUpdate)) || packet.Type == PacketType.CoarseLocationUpdate))
@ -11872,7 +11870,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
dialog.Data.LastName = Util.StringToBytes256(ownerLastName); dialog.Data.LastName = Util.StringToBytes256(ownerLastName);
dialog.Data.Message = Util.StringToBytes256(message); dialog.Data.Message = Util.StringToBytes256(message);
ScriptDialogPacket.ButtonsBlock[] buttons = new ScriptDialogPacket.ButtonsBlock[1]; ScriptDialogPacket.ButtonsBlock[] buttons = new ScriptDialogPacket.ButtonsBlock[1];
buttons[0] = new ScriptDialogPacket.ButtonsBlock(); buttons[0] = new ScriptDialogPacket.ButtonsBlock();
buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!"); buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!");

5
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -321,8 +321,6 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position) private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
{ {
if (m_scene.Permissions.IsGod(avatar.UUID)) return; if (m_scene.Permissions.IsGod(avatar.UUID)) return;
@ -336,7 +334,6 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
avatar.ControllingClient.SendAlertMessage( avatar.ControllingClient.SendAlertMessage(
"You are not allowed on this parcel because the land owner has restricted access."); "You are not allowed on this parcel because the land owner has restricted access.");
} }
public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID) public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID)
@ -741,7 +738,6 @@ namespace OpenSim.Region.CoreModules.World.Land
public void EventManagerOnObjectBeingRemovedFromScene(SceneObjectGroup obj) public void EventManagerOnObjectBeingRemovedFromScene(SceneObjectGroup obj)
{ {
lock (m_landList) lock (m_landList)
{ {
foreach (LandObject p in m_landList.Values) foreach (LandObject p in m_landList.Values)
@ -1078,7 +1074,6 @@ namespace OpenSim.Region.CoreModules.World.Land
temp.Add(currentParcel); temp.Add(currentParcel);
} }
} }
} }
} }

5
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
View File

@ -1353,16 +1353,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// Check if this is an update or a request // Check if this is an update or a request
if (requestArgs["RequestMethod"] == "RemoveGeneric" if (requestArgs["RequestMethod"] == "RemoveGeneric"
|| requestArgs["RequestMethod"] == "AddGeneric" || requestArgs["RequestMethod"] == "AddGeneric")
)
{ {
// Any and all updates cause the cache to clear // Any and all updates cause the cache to clear
m_memoryCache.Clear(); m_memoryCache.Clear();
// Send update to server, return the response without caching it // Send update to server, return the response without caching it
return WebUtil.PostToService(m_groupsServerURI, requestArgs); return WebUtil.PostToService(m_groupsServerURI, requestArgs);
} }
// If we're not doing an update, we must be requesting data // If we're not doing an update, we must be requesting data

1
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -559,5 +559,4 @@ namespace OpenSim.Tests.Common.Setup
sogd.InventoryDeQueueAndDelete(); sogd.InventoryDeQueueAndDelete();
} }
} }
} }