aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/User
diff options
context:
space:
mode:
authorMelanie2009-10-15 21:14:13 +0100
committerMelanie2009-10-15 21:14:13 +0100
commit6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch)
treeffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Services/Connectors/User
parentMerge branch 'master' into vehicles (diff)
parentMerge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff)
downloadopensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Services/Connectors/User')
-rw-r--r--OpenSim/Services/Connectors/User/UserServiceConnector.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
index d418938..683990f 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors
45 LogManager.GetLogger( 45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType); 46 MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 private string m_ServerURI = String.Empty; 48// private string m_ServerURI = String.Empty;
49 49
50 public UserServicesConnector() 50 public UserServicesConnector()
51 { 51 {
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors
53 53
54 public UserServicesConnector(string serverURI) 54 public UserServicesConnector(string serverURI)
55 { 55 {
56 m_ServerURI = serverURI.TrimEnd('/'); 56// m_ServerURI = serverURI.TrimEnd('/');
57 } 57 }
58 58
59 public UserServicesConnector(IConfigSource source) 59 public UserServicesConnector(IConfigSource source)
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors
78 m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); 78 m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService");
79 throw new Exception("User connector init error"); 79 throw new Exception("User connector init error");
80 } 80 }
81 m_ServerURI = serviceURI; 81 //m_ServerURI = serviceURI;
82 } 82 }
83 83
84 public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) 84 public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)