Add copyright headers. Minor formatting cleanup.
parent
518a8b9f2a
commit
de052c48d1
|
@ -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( !TryAuthenticateUser(request, firstname, lastname, out userProfile ) )
|
if (!TryAuthenticateUser(request, firstname, lastname, out userProfile))
|
||||||
{
|
{
|
||||||
return logResponse.CreateLoginFailedResponse();
|
return logResponse.CreateLoginFailedResponse();
|
||||||
}
|
}
|
||||||
|
|
|
@ -616,7 +616,7 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if(SendToUserServer(requestData, "region_startup"))
|
if (SendToUserServer(requestData, "region_startup"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
@ -630,7 +630,7 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if(SendToUserServer(requestData, "region_shutdown"))
|
if (SendToUserServer(requestData, "region_shutdown"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
@ -644,7 +644,7 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if(SendToUserServer(requestData, "agent_location"))
|
if (SendToUserServer(requestData, "agent_location"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
|
|
||||||
|
@ -659,7 +659,7 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
Hashtable result = new Hashtable();
|
Hashtable result = new Hashtable();
|
||||||
result["success"] = "FALSE";
|
result["success"] = "FALSE";
|
||||||
|
|
||||||
if(SendToUserServer(requestData, "agent_leaving"))
|
if (SendToUserServer(requestData, "agent_leaving"))
|
||||||
result["success"] = "TRUE";
|
result["success"] = "TRUE";
|
||||||
|
|
||||||
XmlRpcResponse response = new XmlRpcResponse();
|
XmlRpcResponse response = new XmlRpcResponse();
|
||||||
|
@ -681,7 +681,7 @@ namespace OpenSim.Grid.MessagingServer
|
||||||
|
|
||||||
foreach (UserPresenceData up in m_presences.Values)
|
foreach (UserPresenceData up in m_presences.Values)
|
||||||
{
|
{
|
||||||
if(up.regionData.UUID == regionID)
|
if (up.regionData.UUID == regionID)
|
||||||
{
|
{
|
||||||
if (up.OnlineYN)
|
if (up.OnlineYN)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,3 +1,30 @@
|
||||||
|
/*
|
||||||
|
* 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;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
|
@ -776,7 +776,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
|
info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
|
||||||
|
|
||||||
// accept missing id
|
// accept missing id
|
||||||
if(respData.ContainsKey("regionID_" + i))
|
if (respData.ContainsKey("regionID_" + i))
|
||||||
UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
|
UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -274,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
|
||||||
{
|
{
|
||||||
scene.Entities.Clear();
|
scene.Entities.Clear();
|
||||||
|
|
||||||
foreach(KeyValuePair<UUID,EntityBase> kvp in ReplacementList)
|
foreach (KeyValuePair<UUID,EntityBase> kvp in ReplacementList)
|
||||||
{
|
{
|
||||||
scene.Entities.Add(kvp.Value);
|
scene.Entities.Add(kvp.Value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* 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;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
@ -19,7 +46,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public void Add(EntityBase entity)
|
public void Add(EntityBase entity)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
m_eb_uuid.Add(entity.UUID, entity);
|
m_eb_uuid.Add(entity.UUID, entity);
|
||||||
m_eb_localID.Add(entity.LocalId, entity);
|
m_eb_localID.Add(entity.LocalId, entity);
|
||||||
|
@ -28,7 +55,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public void InsertOrReplace(EntityBase entity)
|
public void InsertOrReplace(EntityBase entity)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
m_eb_uuid[entity.UUID] = entity;
|
m_eb_uuid[entity.UUID] = entity;
|
||||||
m_eb_localID[entity.LocalId] = entity;
|
m_eb_localID[entity.LocalId] = entity;
|
||||||
|
@ -57,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public bool ContainsKey(UUID id)
|
public bool ContainsKey(UUID id)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
return m_eb_uuid.ContainsKey(id);
|
return m_eb_uuid.ContainsKey(id);
|
||||||
}
|
}
|
||||||
|
@ -73,7 +100,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public bool Remove(uint localID)
|
public bool Remove(uint localID)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID);
|
bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID);
|
||||||
bool b = m_eb_localID.Remove(localID);
|
bool b = m_eb_localID.Remove(localID);
|
||||||
|
@ -84,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public bool Remove(UUID id)
|
public bool Remove(UUID id)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId);
|
bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId);
|
||||||
bool b = m_eb_uuid.Remove(id);
|
bool b = m_eb_uuid.Remove(id);
|
||||||
|
@ -97,11 +124,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
List<EntityBase> tmp = new List<EntityBase>();
|
List<EntityBase> tmp = new List<EntityBase>();
|
||||||
|
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
foreach (KeyValuePair<UUID, EntityBase> pair in m_eb_uuid)
|
foreach (KeyValuePair<UUID, EntityBase> pair in m_eb_uuid)
|
||||||
{
|
{
|
||||||
if(pair.Value is T)
|
if (pair.Value is T)
|
||||||
{
|
{
|
||||||
tmp.Add(pair.Value);
|
tmp.Add(pair.Value);
|
||||||
}
|
}
|
||||||
|
@ -151,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public bool TryGetValue(UUID key, out EntityBase obj)
|
public bool TryGetValue(UUID key, out EntityBase obj)
|
||||||
{
|
{
|
||||||
lock(m_lock)
|
lock (m_lock)
|
||||||
{
|
{
|
||||||
return m_eb_uuid.TryGetValue(key, out obj);
|
return m_eb_uuid.TryGetValue(key, out obj);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue