aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-07-23 17:22:23 +0000
committerMW2007-07-23 17:22:23 +0000
commitf8c1366cbf4aaa04ca295d6bbfd6303d010df770 (patch)
tree9e06f9dd7345e00b8a0d442d70dc290e006f06fe /OpenSim/Framework
parent* Fixed a typecasting issue with Navier-Stokes algorithms in libTerrain. (diff)
downloadopensim-SC_OLD-f8c1366cbf4aaa04ca295d6bbfd6303d010df770.zip
opensim-SC_OLD-f8c1366cbf4aaa04ca295d6bbfd6303d010df770.tar.gz
opensim-SC_OLD-f8c1366cbf4aaa04ca295d6bbfd6303d010df770.tar.bz2
opensim-SC_OLD-f8c1366cbf4aaa04ca295d6bbfd6303d010df770.tar.xz
Applied makomk 's patch from issue #219.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs16
1 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 326b943..e1fc391 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -17,9 +17,7 @@ namespace OpenSim.Framework.UserManagement
17 private Hashtable loginFlagsHash; 17 private Hashtable loginFlagsHash;
18 private Hashtable globalTexturesHash; 18 private Hashtable globalTexturesHash;
19 private Hashtable loginError; 19 private Hashtable loginError;
20 private Hashtable eventCategoriesHash;
21 private Hashtable uiConfigHash; 20 private Hashtable uiConfigHash;
22 private Hashtable classifiedCategoriesHash;
23 21
24 private ArrayList loginFlags; 22 private ArrayList loginFlags;
25 private ArrayList globalTextures; 23 private ArrayList globalTextures;
@@ -82,8 +80,6 @@ namespace OpenSim.Framework.UserManagement
82 this.classifiedCategories = new ArrayList(); 80 this.classifiedCategories = new ArrayList();
83 81
84 this.loginError = new Hashtable(); 82 this.loginError = new Hashtable();
85 this.eventCategoriesHash = new Hashtable();
86 this.classifiedCategoriesHash = new Hashtable();
87 this.uiConfigHash = new Hashtable(); 83 this.uiConfigHash = new Hashtable();
88 84
89 this.defaultXmlRpcResponse = new XmlRpcResponse(); 85 this.defaultXmlRpcResponse = new XmlRpcResponse();
@@ -215,7 +211,7 @@ namespace OpenSim.Framework.UserManagement
215 this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture; 211 this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture;
216 this.globalTexturesHash["moon_texture_id"] = this.MoonTexture; 212 this.globalTexturesHash["moon_texture_id"] = this.MoonTexture;
217 this.globalTextures.Add(this.globalTexturesHash); 213 this.globalTextures.Add(this.globalTexturesHash);
218 this.eventCategories.Add(this.eventCategoriesHash); 214 // this.eventCategories.Add(this.eventCategoriesHash);
219 215
220 this.AddToUIConfig("allow_first_life", this.allowFirstLife); 216 this.AddToUIConfig("allow_first_life", this.allowFirstLife);
221 this.uiConfig.Add(this.uiConfigHash); 217 this.uiConfig.Add(this.uiConfigHash);
@@ -273,7 +269,8 @@ namespace OpenSim.Framework.UserManagement
273 269
274 public void SetEventCategories(string category, string value) 270 public void SetEventCategories(string category, string value)
275 { 271 {
276 this.eventCategoriesHash[category] = value; 272 // this.eventCategoriesHash[category] = value;
273 //TODO
277 } // SetEventCategories 274 } // SetEventCategories
278 275
279 public void AddToUIConfig(string itemName, string item) 276 public void AddToUIConfig(string itemName, string item)
@@ -283,9 +280,10 @@ namespace OpenSim.Framework.UserManagement
283 280
284 public void AddClassifiedCategory(Int32 ID, string categoryName) 281 public void AddClassifiedCategory(Int32 ID, string categoryName)
285 { 282 {
286 this.classifiedCategoriesHash["category_name"] = categoryName; 283 Hashtable hash = new Hashtable();
287 this.classifiedCategoriesHash["category_id"] = ID; 284 hash["category_name"] = categoryName;
288 this.classifiedCategories.Add(this.classifiedCategoriesHash); 285 hash["category_id"] = ID;
286 this.classifiedCategories.Add(hash);
289 // this.classifiedCategoriesHash.Clear(); 287 // this.classifiedCategoriesHash.Clear();
290 } // SetClassifiedCategory 288 } // SetClassifiedCategory
291 289