Update svn properties. Add copyright header. Minor formatting cleanup.

0.6.1-post-fixes
Jeff Ames 2008-11-30 00:51:40 +00:00
parent d579246257
commit 077314cdd3
5 changed files with 57 additions and 30 deletions

View File

@ -286,7 +286,7 @@ namespace OpenSim.Data.MySQL
try try
{ {
while(reader.Read()) while (reader.Read())
{ {
uuids.Add(new UUID(reader["UUID"].ToString())); uuids.Add(new UUID(reader["UUID"].ToString()));
} }

View File

@ -152,7 +152,7 @@ namespace OpenSim.Framework.Communications
m_log.DebugFormat( m_log.DebugFormat(
"[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest); "[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(); return logResponse.CreateLoginFailedResponse();
} }

View File

@ -3477,7 +3477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_genericPacketHandlers.Count == 0) return false; if (m_genericPacketHandlers.Count == 0) return false;
handlerGenericMessage = null; handlerGenericMessage = null;
string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim(); 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>(); List<string> msg = new List<string>();

View File

@ -2169,7 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes
if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) 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 // Fix up attachment Parent Local ID
// //

View File

@ -1,26 +1,53 @@
using System; /*
using System.Collections.Generic; * Copyright (c) Contributors, http://opensimulator.org/
using System.Runtime.Remoting.Lifetime; * See CONTRIBUTORS.TXT for a full list of copyright holders.
using System.Text; *
* Redistribution and use in source and binary forms, with or without
namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime * modification, are permitted provided that the following conditions are met:
{ * * Redistributions of source code must retain the above copyright
[Serializable] * notice, this list of conditions and the following disclaimer.
public class ScriptSponsor : MarshalByRefObject, ISponsor * * Redistributions in binary form must reproduce the above copyright
{ * notice, this list of conditions and the following disclaimer in the
// In theory: I execute, therefore I am. * documentation and/or other materials provided with the distribution.
// If GC collects this class then sponsorship will expire * * Neither the name of the OpenSimulator Project nor the
public TimeSpan Renewal(ILease lease) * names of its contributors may be used to endorse or promote products
{ * derived from this software without specific prior written permission.
return TimeSpan.FromMinutes(2); *
} * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
#if DEBUG * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// For tracing GC while debugging * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
public static bool GCDummy = false; * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
~ScriptSponsor() * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
{ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
GCDummy = true; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
} * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
#endif * (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
}
}