aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs11
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs18
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs7
8 files changed, 36 insertions, 29 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index f5a5e83..2960a62 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,18 +25,20 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections; 29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
30using libsecondlife; 32using libsecondlife;
33using log4net;
31using OpenSim.Framework; 34using OpenSim.Framework;
32using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
33using OpenSim.Framework.Console;
34 36
35namespace OpenSim.Region.Communications.Local 37namespace OpenSim.Region.Communications.Local
36{ 38{
37 public class LocalBackEndServices : IGridServices, IInterRegionCommunications 39 public class LocalBackEndServices : IGridServices, IInterRegionCommunications
38 { 40 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 42
41 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); 43 protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
42 44
@@ -47,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
47 49
48 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 50 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
49 51
50 public string _gdebugRegionName = System.String.Empty; 52 public string _gdebugRegionName = String.Empty;
51 53
52 bool m_bAvailable=true; 54 bool m_bAvailable=true;
53 55
@@ -67,7 +69,7 @@ namespace OpenSim.Region.Communications.Local
67 set { _gdebugRegionName = value; } 69 set { _gdebugRegionName = value; }
68 } 70 }
69 71
70 public string _rdebugRegionName = System.String.Empty; 72 public string _rdebugRegionName = String.Empty;
71 73
72 public string rdebugRegionName 74 public string rdebugRegionName
73 { 75 {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index dafd637..a567eeb 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -26,7 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
31using log4net;
30using OpenSim.Framework; 32using OpenSim.Framework;
31using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
@@ -39,8 +41,8 @@ namespace OpenSim.Region.Communications.Local
39 /// </summary> 41 /// </summary>
40 public class LocalInventoryService : InventoryServiceBase 42 public class LocalInventoryService : InventoryServiceBase
41 { 43 {
42 private static readonly log4net.ILog m_log 44 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 46
45 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 47 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
46 { 48 {
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 79bf9e5..c4823f4 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -28,14 +28,11 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
32 33using log4net;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Statistics;
37using OpenSim.Framework.UserManagement; 35using OpenSim.Framework.UserManagement;
38using InventoryFolder=OpenSim.Framework.InventoryFolder;
39 36
40namespace OpenSim.Region.Communications.Local 37namespace OpenSim.Region.Communications.Local
41{ 38{
@@ -43,8 +40,8 @@ namespace OpenSim.Region.Communications.Local
43 40
44 public class LocalLoginService : LoginService 41 public class LocalLoginService : LoginService
45 { 42 {
46 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
47 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 45
49 private CommunicationsLocal m_Parent; 46 private CommunicationsLocal m_Parent;
50 47
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index c543762..29de8fd 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,7 +29,6 @@ using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Statistics;
33using OpenSim.Framework.UserManagement; 32using OpenSim.Framework.UserManagement;
34 33
35namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 1135ddd..eada868 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -30,15 +30,17 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection;
33using System.Runtime.Remoting; 34using System.Runtime.Remoting;
34using System.Runtime.Remoting.Channels; 35using System.Runtime.Remoting.Channels;
35using System.Runtime.Remoting.Channels.Tcp; 36using System.Runtime.Remoting.Channels.Tcp;
36using System.Security.Authentication; 37using System.Security.Authentication;
38using System.Threading;
37using libsecondlife; 39using libsecondlife;
40using log4net;
38using Nwc.XmlRpc; 41using Nwc.XmlRpc;
39using OpenSim.Framework; 42using OpenSim.Framework;
40using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
44 46
@@ -46,7 +48,7 @@ namespace OpenSim.Region.Communications.OGS1
46{ 48{
47 public class OGS1GridServices : IGridServices, IInterRegionCommunications 49 public class OGS1GridServices : IGridServices, IInterRegionCommunications
48 { 50 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 52
51 private LocalBackEndServices m_localBackend = new LocalBackEndServices(); 53 private LocalBackEndServices m_localBackend = new LocalBackEndServices();
52 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); 54 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
@@ -1461,7 +1463,7 @@ namespace OpenSim.Region.Communications.OGS1
1461 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); 1463 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
1462 IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket); 1464 IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket);
1463 ar.AsyncWaitHandle.WaitOne(timeOut*1000, false); 1465 ar.AsyncWaitHandle.WaitOne(timeOut*1000, false);
1464 System.Threading.Thread.Sleep(500); 1466 Thread.Sleep(500);
1465 } 1467 }
1466 1468
1467 public bool Available 1469 public bool Available
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 2e106d7..8285fb1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -26,8 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
29using System.Runtime.Remoting; 30using System.Runtime.Remoting;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using OpenSim.Framework; 33using OpenSim.Framework;
32 34
33namespace OpenSim.Region.Communications.OGS1 35namespace OpenSim.Region.Communications.OGS1
@@ -153,7 +155,7 @@ namespace OpenSim.Region.Communications.OGS1
153 155
154 public class OGS1InterRegionRemoting : MarshalByRefObject 156 public class OGS1InterRegionRemoting : MarshalByRefObject
155 { 157 {
156 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 158 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
157 159
158 public OGS1InterRegionRemoting() 160 public OGS1InterRegionRemoting()
159 { 161 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index fbe905c..e0167a7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -27,19 +27,21 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
30using libsecondlife; 32using libsecondlife;
33using log4net;
31using OpenSim.Framework; 34using OpenSim.Framework;
32using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
36 38
37namespace OpenSim.Region.Communications.OGS1 39namespace OpenSim.Region.Communications.OGS1
38{ 40{
39 public class OGS1InventoryService : IInventoryServices 41 public class OGS1InventoryService : IInventoryServices
40 { 42 {
41 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
42 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 private string _inventoryServerUrl; 46 private string _inventoryServerUrl;
45 private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); 47 private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>();
@@ -71,7 +73,7 @@ namespace OpenSim.Region.Communications.OGS1
71 73
72 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); 74 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
73 } 75 }
74 catch (System.Net.WebException e) 76 catch (WebException e)
75 { 77 {
76 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", 78 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
77 e.Source, e.Message); 79 e.Source, e.Message);
@@ -153,7 +155,7 @@ namespace OpenSim.Region.Communications.OGS1
153 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 155 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
154 "POST", _inventoryServerUrl + "/NewFolder/", folder); 156 "POST", _inventoryServerUrl + "/NewFolder/", folder);
155 } 157 }
156 catch (System.Net.WebException e) 158 catch (WebException e)
157 { 159 {
158 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", 160 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}",
159 e.Source, e.Message); 161 e.Source, e.Message);
@@ -167,7 +169,7 @@ namespace OpenSim.Region.Communications.OGS1
167 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 169 SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
168 "POST", _inventoryServerUrl + "/MoveFolder/", folder); 170 "POST", _inventoryServerUrl + "/MoveFolder/", folder);
169 } 171 }
170 catch (System.Net.WebException e) 172 catch (WebException e)
171 { 173 {
172 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 174 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
173 e.Source, e.Message); 175 e.Source, e.Message);
@@ -181,7 +183,7 @@ namespace OpenSim.Region.Communications.OGS1
181 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 183 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
182 "POST", _inventoryServerUrl + "/NewItem/", item); 184 "POST", _inventoryServerUrl + "/NewItem/", item);
183 } 185 }
184 catch (System.Net.WebException e) 186 catch (WebException e)
185 { 187 {
186 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", 188 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}",
187 e.Source, e.Message); 189 e.Source, e.Message);
@@ -195,7 +197,7 @@ namespace OpenSim.Region.Communications.OGS1
195 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 197 SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
196 "POST", _inventoryServerUrl + "/DeleteItem/", item); 198 "POST", _inventoryServerUrl + "/DeleteItem/", item);
197 } 199 }
198 catch (System.Net.WebException e) 200 catch (WebException e)
199 { 201 {
200 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", 202 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}",
201 e.Source, e.Message); 203 e.Source, e.Message);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index c140213..56b0e8c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -29,17 +29,18 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using Nwc.XmlRpc; 36using Nwc.XmlRpc;
35using OpenSim.Framework; 37using OpenSim.Framework;
36using OpenSim.Framework.Console;
37 38
38namespace OpenSim.Region.Communications.OGS1 39namespace OpenSim.Region.Communications.OGS1
39{ 40{
40 public class OGS1UserServices : IUserService 41 public class OGS1UserServices : IUserService
41 { 42 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 44
44 private CommunicationsOGS1 m_parent; 45 private CommunicationsOGS1 m_parent;
45 46
@@ -158,7 +159,7 @@ namespace OpenSim.Region.Communications.OGS1
158 { 159 {
159 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 160 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
160 } 161 }
161 catch (System.Net.WebException) 162 catch (WebException)
162 { 163 {
163 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); 164 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff");
164 } 165 }