aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs1
2 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 16e5d93..f4e858b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -645,8 +645,6 @@ namespace OpenSim.Region.Communications.OGS1
645 MainLog.Instance.Debug(e.ToString()); 645 MainLog.Instance.Debug(e.ToString());
646 return false; 646 return false;
647 } 647 }
648
649 return true;
650 } 648 }
651 /// <summary> 649 /// <summary>
652 /// 650 ///
@@ -857,7 +855,7 @@ namespace OpenSim.Region.Communications.OGS1
857 { 855 {
858 return m_localBackend.IncomingChildAgent(regionHandle, agentData); 856 return m_localBackend.IncomingChildAgent(regionHandle, agentData);
859 } 857 }
860 catch (RemotingException e) 858 catch (RemotingException)
861 { 859 {
862 //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); 860 //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
863 return false; 861 return false;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 9e1206b..b841154 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -165,7 +165,6 @@ namespace OpenSim.Region.Communications.OGS1
165 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) 165 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
166 { 166 {
167 throw new Exception("The method or operation is not implemented."); 167 throw new Exception("The method or operation is not implemented.");
168 return LLUUID.Zero;
169 } 168 }
170 } 169 }
171} \ No newline at end of file 170} \ No newline at end of file