aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-10-14 19:43:56 +0100
committerJustin Clark-Casey (justincc)2009-10-14 19:43:56 +0100
commit0cb0a28fde4c1d870c157bd19675a0653b06bc80 (patch)
tree397b71cc3c5d107a3f26c3c00c49f55a05d57db6
parentSet the estate owner to be the master avatar if it's not set. (diff)
downloadopensim-SC-0cb0a28fde4c1d870c157bd19675a0653b06bc80.zip
opensim-SC-0cb0a28fde4c1d870c157bd19675a0653b06bc80.tar.gz
opensim-SC-0cb0a28fde4c1d870c157bd19675a0653b06bc80.tar.bz2
opensim-SC-0cb0a28fde4c1d870c157bd19675a0653b06bc80.tar.xz
* minor: remove some mono compiler warnings
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/User/UserServiceConnector.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 6f7c90f..ecda85a 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -298,7 +298,7 @@ namespace OpenSim.Services.Connectors
298 return; 298 return;
299 } 299 }
300 300
301 AssetBase asset = asset = m_Cache.Get(assetID.ToString()); 301 AssetBase asset = m_Cache.Get(assetID.ToString());
302 302
303 if (asset == null) 303 if (asset == null)
304 { 304 {
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)