aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-19 00:34:13 +0000
committerJustin Clark-Casey (justincc)2011-11-19 00:34:13 +0000
commitb89534ad0a8a0be24f27634b9a198e2b53f129e0 (patch)
tree11ed7a6ee44f8187d6c8ea60227805c43bbe7da3 /OpenSim/Server
parentImprove some grid region log messages to express regions at co-ordinate (e.g.... (diff)
downloadopensim-SC_OLD-b89534ad0a8a0be24f27634b9a198e2b53f129e0.zip
opensim-SC_OLD-b89534ad0a8a0be24f27634b9a198e2b53f129e0.tar.gz
opensim-SC_OLD-b89534ad0a8a0be24f27634b9a198e2b53f129e0.tar.bz2
opensim-SC_OLD-b89534ad0a8a0be24f27634b9a198e2b53f129e0.tar.xz
Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs2
-rw-r--r--OpenSim/Server/Handlers/Map/MapGetServerConnector.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 5c89d0f..56f130e 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -99,7 +99,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
99 } 99 }
100 100
101 return FailureResult(); 101 return FailureResult();
102
103 } 102 }
104 103
105 #region Method-specific handlers 104 #region Method-specific handlers
@@ -127,7 +126,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
127 return FailureResult(); 126 return FailureResult();
128 } 127 }
129 128
130 string perms = "0";
131 FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID); 129 FriendInfo[] friendsInfo = m_FriendsService.GetFriends(principalID);
132 foreach (FriendInfo finfo in friendsInfo) 130 foreach (FriendInfo finfo in friendsInfo)
133 { 131 {
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index e8a424f..501074d 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Server.Handlers.MapImage
42{ 42{
43 public class MapGetServiceConnector : ServiceConnector 43 public class MapGetServiceConnector : ServiceConnector
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46
46 private IMapImageService m_MapService; 47 private IMapImageService m_MapService;
47 48
48 private string m_ConfigName = "MapImageService"; 49 private string m_ConfigName = "MapImageService";
@@ -69,7 +70,8 @@ namespace OpenSim.Server.Handlers.MapImage
69 70
70 class MapServerGetHandler : BaseStreamHandler 71 class MapServerGetHandler : BaseStreamHandler
71 { 72 {
72 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 73// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
74
73 private IMapImageService m_MapService; 75 private IMapImageService m_MapService;
74 76
75 public MapServerGetHandler(IMapImageService service) : 77 public MapServerGetHandler(IMapImageService service) :