From 077314cdd3b0acdebb2d39eb0c0108814313f8f0 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 30 Nov 2008 00:51:40 +0000
Subject: Update svn properties. Add copyright header. Minor formatting
cleanup.
---
OpenSim/Data/MySQL/MySQLRegionData.cs | 2 +-
OpenSim/Framework/Communications/LoginService.cs | 2 +-
.../Region/ClientStack/LindenUDP/LLClientView.cs | 2 +-
OpenSim/Region/Environment/Scenes/Scene.cs | 2 +-
.../Shared/Api/Runtime/ScriptSponsor.cs | 79 +++++++++++++++-------
5 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index af70d11..33e005b 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -286,7 +286,7 @@ namespace OpenSim.Data.MySQL
try
{
- while(reader.Read())
+ while (reader.Read())
{
uuids.Add(new UUID(reader["UUID"].ToString()));
}
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 883f965..e4e00a7 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Framework.Communications
m_log.DebugFormat(
"[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest);
- if( !TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile ) )
+ if (!TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile))
{
return logResponse.CreateLoginFailedResponse();
}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d7cad85..74bf7e5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3477,7 +3477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_genericPacketHandlers.Count == 0) return false;
handlerGenericMessage = null;
string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim();
- if(m_genericPacketHandlers.TryGetValue(method, out handlerGenericMessage))
+ if (m_genericPacketHandlers.TryGetValue(method, out handlerGenericMessage))
{
List<string> msg = new List<string>();
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 92738a2..d1634f8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2169,7 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes
if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
{
- if(sceneObject.RootPart.Shape.State != 0)
+ if (sceneObject.RootPart.Shape.State != 0)
{
// Fix up attachment Parent Local ID
//
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
index 13c25d7..a2da14e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
@@ -1,26 +1,53 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Remoting.Lifetime;
-using System.Text;
-
-namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime
-{
- [Serializable]
- public class ScriptSponsor : MarshalByRefObject, ISponsor
- {
- // In theory: I execute, therefore I am.
- // If GC collects this class then sponsorship will expire
- public TimeSpan Renewal(ILease lease)
- {
- return TimeSpan.FromMinutes(2);
- }
-#if DEBUG
- // For tracing GC while debugging
- public static bool GCDummy = false;
- ~ScriptSponsor()
- {
- GCDummy = true;
- }
-#endif
- }
-}
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.Remoting.Lifetime;
+using System.Text;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime
+{
+ [Serializable]
+ public class ScriptSponsor : MarshalByRefObject, ISponsor
+ {
+ // In theory: I execute, therefore I am.
+ // If GC collects this class then sponsorship will expire
+ public TimeSpan Renewal(ILease lease)
+ {
+ return TimeSpan.FromMinutes(2);
+ }
+#if DEBUG
+ // For tracing GC while debugging
+ public static bool GCDummy = false;
+ ~ScriptSponsor()
+ {
+ GCDummy = true;
+ }
+#endif
+ }
+}
--
cgit v1.1