aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-11-30 00:51:40 +0000
committerJeff Ames2008-11-30 00:51:40 +0000
commit077314cdd3b0acdebb2d39eb0c0108814313f8f0 (patch)
tree593de52b685729b35b4f2b05487ef7b15b327eb5 /OpenSim
parentExplicitly Dispose() all cmd objects (diff)
downloadopensim-SC-077314cdd3b0acdebb2d39eb0c0108814313f8f0.zip
opensim-SC-077314cdd3b0acdebb2d39eb0c0108814313f8f0.tar.gz
opensim-SC-077314cdd3b0acdebb2d39eb0c0108814313f8f0.tar.bz2
opensim-SC-077314cdd3b0acdebb2d39eb0c0108814313f8f0.tar.xz
Update svn properties. Add copyright header. Minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs79
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
286 286
287 try 287 try
288 { 288 {
289 while(reader.Read()) 289 while (reader.Read())
290 { 290 {
291 uuids.Add(new UUID(reader["UUID"].ToString())); 291 uuids.Add(new UUID(reader["UUID"].ToString()));
292 } 292 }
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
152 m_log.DebugFormat( 152 m_log.DebugFormat(
153 "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest); 153 "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest);
154 154
155 if( !TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile ) ) 155 if (!TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile))
156 { 156 {
157 return logResponse.CreateLoginFailedResponse(); 157 return logResponse.CreateLoginFailedResponse();
158 } 158 }
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
3477 if (m_genericPacketHandlers.Count == 0) return false; 3477 if (m_genericPacketHandlers.Count == 0) return false;
3478 handlerGenericMessage = null; 3478 handlerGenericMessage = null;
3479 string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim(); 3479 string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim();
3480 if(m_genericPacketHandlers.TryGetValue(method, out handlerGenericMessage)) 3480 if (m_genericPacketHandlers.TryGetValue(method, out handlerGenericMessage))
3481 { 3481 {
3482 List<string> msg = new List<string>(); 3482 List<string> msg = new List<string>();
3483 3483
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
2169 2169
2170 if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) 2170 if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
2171 { 2171 {
2172 if(sceneObject.RootPart.Shape.State != 0) 2172 if (sceneObject.RootPart.Shape.State != 0)
2173 { 2173 {
2174 // Fix up attachment Parent Local ID 2174 // Fix up attachment Parent Local ID
2175 // 2175 //
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 @@
1using System; 1/*
2using System.Collections.Generic; 2 * Copyright (c) Contributors, http://opensimulator.org/
3using System.Runtime.Remoting.Lifetime; 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4using System.Text; 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime 6 * modification, are permitted provided that the following conditions are met:
7{ 7 * * Redistributions of source code must retain the above copyright
8 [Serializable] 8 * notice, this list of conditions and the following disclaimer.
9 public class ScriptSponsor : MarshalByRefObject, ISponsor 9 * * Redistributions in binary form must reproduce the above copyright
10 { 10 * notice, this list of conditions and the following disclaimer in the
11 // In theory: I execute, therefore I am. 11 * documentation and/or other materials provided with the distribution.
12 // If GC collects this class then sponsorship will expire 12 * * Neither the name of the OpenSimulator Project nor the
13 public TimeSpan Renewal(ILease lease) 13 * names of its contributors may be used to endorse or promote products
14 { 14 * derived from this software without specific prior written permission.
15 return TimeSpan.FromMinutes(2); 15 *
16 } 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17#if DEBUG 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 // For tracing GC while debugging 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 public static bool GCDummy = false; 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 ~ScriptSponsor() 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 { 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 GCDummy = true; 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 } 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24#endif 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 } 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26} 26 */
27
28using System;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime;
31using System.Text;
32
33namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime
34{
35 [Serializable]
36 public class ScriptSponsor : MarshalByRefObject, ISponsor
37 {
38 // In theory: I execute, therefore I am.
39 // If GC collects this class then sponsorship will expire
40 public TimeSpan Renewal(ILease lease)
41 {
42 return TimeSpan.FromMinutes(2);
43 }
44#if DEBUG
45 // For tracing GC while debugging
46 public static bool GCDummy = false;
47 ~ScriptSponsor()
48 {
49 GCDummy = true;
50 }
51#endif
52 }
53}