aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-12-16 08:48:29 -0800
committerDiva Canto2011-12-16 08:48:29 -0800
commit7e4a2d69d56713cbe77da4c1e5718be9bb423647 (patch)
tree00db28dc23f084cf89ca031b7c199b72de3daa43
parentStop pointlessly setting the m_colliderarr[] to false in the ODECharacter con... (diff)
downloadopensim-SC_OLD-7e4a2d69d56713cbe77da4c1e5718be9bb423647.zip
opensim-SC_OLD-7e4a2d69d56713cbe77da4c1e5718be9bb423647.tar.gz
opensim-SC_OLD-7e4a2d69d56713cbe77da4c1e5718be9bb423647.tar.bz2
opensim-SC_OLD-7e4a2d69d56713cbe77da4c1e5718be9bb423647.tar.xz
HG minor bug fix and marked one method obsolete in UAS.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs5
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs1
3 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index a87279a..cc9ba97 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -123,7 +123,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
123 { 123 {
124 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); 124 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
125 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); 125 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
126 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI); 126 if (real_destination != null)
127 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI);
128 else
129 m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: GetHyperlinkRegion to Gatekeeper {0} failed", region.ServerURI);
127 return real_destination; 130 return real_destination;
128 } 131 }
129 return region; 132 return region;
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 50010f2..07c6962 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -259,6 +259,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
259 259
260 } 260 }
261 261
262 [Obsolete]
262 public XmlRpcResponse GetOnlineFriends(XmlRpcRequest request, IPEndPoint remoteClient) 263 public XmlRpcResponse GetOnlineFriends(XmlRpcRequest request, IPEndPoint remoteClient)
263 { 264 {
264 Hashtable hash = new Hashtable(); 265 Hashtable hash = new Hashtable();
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 7a4ec57..0c55c2e 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
486 return friendsOnline; 486 return friendsOnline;
487 } 487 }
488 488
489 [Obsolete]
489 public List<UUID> GetOnlineFriends(UUID userID, List<string> friends) 490 public List<UUID> GetOnlineFriends(UUID userID, List<string> friends)
490 { 491 {
491 Hashtable hash = new Hashtable(); 492 Hashtable hash = new Hashtable();