aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs10
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs27
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityManager.cs45
6 files changed, 71 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index c3dcc90..d6d0e27 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( !TryAuthenticateUser(request, firstname, lastname, out userProfile ) ) 155 if (!TryAuthenticateUser(request, firstname, lastname, out userProfile))
156 { 156 {
157 return logResponse.CreateLoginFailedResponse(); 157 return logResponse.CreateLoginFailedResponse();
158 } 158 }
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index a8ee9d5..7a4a47f 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -616,7 +616,7 @@ namespace OpenSim.Grid.MessagingServer
616 Hashtable result = new Hashtable(); 616 Hashtable result = new Hashtable();
617 result["success"] = "FALSE"; 617 result["success"] = "FALSE";
618 618
619 if(SendToUserServer(requestData, "region_startup")) 619 if (SendToUserServer(requestData, "region_startup"))
620 result["success"] = "TRUE"; 620 result["success"] = "TRUE";
621 621
622 XmlRpcResponse response = new XmlRpcResponse(); 622 XmlRpcResponse response = new XmlRpcResponse();
@@ -630,7 +630,7 @@ namespace OpenSim.Grid.MessagingServer
630 Hashtable result = new Hashtable(); 630 Hashtable result = new Hashtable();
631 result["success"] = "FALSE"; 631 result["success"] = "FALSE";
632 632
633 if(SendToUserServer(requestData, "region_shutdown")) 633 if (SendToUserServer(requestData, "region_shutdown"))
634 result["success"] = "TRUE"; 634 result["success"] = "TRUE";
635 635
636 XmlRpcResponse response = new XmlRpcResponse(); 636 XmlRpcResponse response = new XmlRpcResponse();
@@ -644,7 +644,7 @@ namespace OpenSim.Grid.MessagingServer
644 Hashtable result = new Hashtable(); 644 Hashtable result = new Hashtable();
645 result["success"] = "FALSE"; 645 result["success"] = "FALSE";
646 646
647 if(SendToUserServer(requestData, "agent_location")) 647 if (SendToUserServer(requestData, "agent_location"))
648 result["success"] = "TRUE"; 648 result["success"] = "TRUE";
649 649
650 650
@@ -659,7 +659,7 @@ namespace OpenSim.Grid.MessagingServer
659 Hashtable result = new Hashtable(); 659 Hashtable result = new Hashtable();
660 result["success"] = "FALSE"; 660 result["success"] = "FALSE";
661 661
662 if(SendToUserServer(requestData, "agent_leaving")) 662 if (SendToUserServer(requestData, "agent_leaving"))
663 result["success"] = "TRUE"; 663 result["success"] = "TRUE";
664 664
665 XmlRpcResponse response = new XmlRpcResponse(); 665 XmlRpcResponse response = new XmlRpcResponse();
@@ -681,7 +681,7 @@ namespace OpenSim.Grid.MessagingServer
681 681
682 foreach (UserPresenceData up in m_presences.Values) 682 foreach (UserPresenceData up in m_presences.Values)
683 { 683 {
684 if(up.regionData.UUID == regionID) 684 if (up.regionData.UUID == regionID)
685 { 685 {
686 if (up.OnlineYN) 686 if (up.OnlineYN)
687 { 687 {
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index ef23adc..7605bae 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -1,3 +1,30 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
1using System; 28using System;
2using System.Collections; 29using System.Collections;
3using System.Collections.Generic; 30using System.Collections.Generic;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 5f39d8f..af8d53e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Communications.OGS1
776 info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]); 776 info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
777 777
778 // accept missing id 778 // accept missing id
779 if(respData.ContainsKey("regionID_" + i)) 779 if (respData.ContainsKey("regionID_" + i))
780 UUID.TryParse((string)respData["regionID_" + i], out info.regionID); 780 UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
781 } 781 }
782 782
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index 65fa9ba..02e77bb 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
274 { 274 {
275 scene.Entities.Clear(); 275 scene.Entities.Clear();
276 276
277 foreach(KeyValuePair<UUID,EntityBase> kvp in ReplacementList) 277 foreach (KeyValuePair<UUID,EntityBase> kvp in ReplacementList)
278 { 278 {
279 scene.Entities.Add(kvp.Value); 279 scene.Entities.Add(kvp.Value);
280 } 280 }
diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Environment/Scenes/EntityManager.cs
index eb29ead..25f73b4 100644
--- a/OpenSim/Region/Environment/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityManager.cs
@@ -1,4 +1,31 @@
1using System; 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
2using System.Collections; 29using System.Collections;
3using System.Collections.Generic; 30using System.Collections.Generic;
4using OpenMetaverse; 31using OpenMetaverse;
@@ -19,7 +46,7 @@ namespace OpenSim.Region.Environment.Scenes
19 46
20 public void Add(EntityBase entity) 47 public void Add(EntityBase entity)
21 { 48 {
22 lock(m_lock) 49 lock (m_lock)
23 { 50 {
24 m_eb_uuid.Add(entity.UUID, entity); 51 m_eb_uuid.Add(entity.UUID, entity);
25 m_eb_localID.Add(entity.LocalId, entity); 52 m_eb_localID.Add(entity.LocalId, entity);
@@ -28,7 +55,7 @@ namespace OpenSim.Region.Environment.Scenes
28 55
29 public void InsertOrReplace(EntityBase entity) 56 public void InsertOrReplace(EntityBase entity)
30 { 57 {
31 lock(m_lock) 58 lock (m_lock)
32 { 59 {
33 m_eb_uuid[entity.UUID] = entity; 60 m_eb_uuid[entity.UUID] = entity;
34 m_eb_localID[entity.LocalId] = entity; 61 m_eb_localID[entity.LocalId] = entity;
@@ -57,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes
57 84
58 public bool ContainsKey(UUID id) 85 public bool ContainsKey(UUID id)
59 { 86 {
60 lock(m_lock) 87 lock (m_lock)
61 { 88 {
62 return m_eb_uuid.ContainsKey(id); 89 return m_eb_uuid.ContainsKey(id);
63 } 90 }
@@ -73,7 +100,7 @@ namespace OpenSim.Region.Environment.Scenes
73 100
74 public bool Remove(uint localID) 101 public bool Remove(uint localID)
75 { 102 {
76 lock(m_lock) 103 lock (m_lock)
77 { 104 {
78 bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID); 105 bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID);
79 bool b = m_eb_localID.Remove(localID); 106 bool b = m_eb_localID.Remove(localID);
@@ -84,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes
84 111
85 public bool Remove(UUID id) 112 public bool Remove(UUID id)
86 { 113 {
87 lock(m_lock) 114 lock (m_lock)
88 { 115 {
89 bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId); 116 bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId);
90 bool b = m_eb_uuid.Remove(id); 117 bool b = m_eb_uuid.Remove(id);
@@ -97,11 +124,11 @@ namespace OpenSim.Region.Environment.Scenes
97 { 124 {
98 List<EntityBase> tmp = new List<EntityBase>(); 125 List<EntityBase> tmp = new List<EntityBase>();
99 126
100 lock(m_lock) 127 lock (m_lock)
101 { 128 {
102 foreach (KeyValuePair<UUID, EntityBase> pair in m_eb_uuid) 129 foreach (KeyValuePair<UUID, EntityBase> pair in m_eb_uuid)
103 { 130 {
104 if(pair.Value is T) 131 if (pair.Value is T)
105 { 132 {
106 tmp.Add(pair.Value); 133 tmp.Add(pair.Value);
107 } 134 }
@@ -151,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes
151 178
152 public bool TryGetValue(UUID key, out EntityBase obj) 179 public bool TryGetValue(UUID key, out EntityBase obj)
153 { 180 {
154 lock(m_lock) 181 lock (m_lock)
155 { 182 {
156 return m_eb_uuid.TryGetValue(key, out obj); 183 return m_eb_uuid.TryGetValue(key, out obj);
157 } 184 }