aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-12-29 15:39:12 -0800
committerDiva Canto2011-12-29 15:39:12 -0800
commit42f5394677a0a033e501f343cc3ccf02627e09d8 (patch)
tree7a87eefa751eab56047bc0033f65915f88caf7bc
parentDeleted two obsolete files in Inventory modules. (diff)
downloadopensim-SC_OLD-42f5394677a0a033e501f343cc3ccf02627e09d8.zip
opensim-SC_OLD-42f5394677a0a033e501f343cc3ccf02627e09d8.tar.gz
opensim-SC_OLD-42f5394677a0a033e501f343cc3ccf02627e09d8.tar.bz2
opensim-SC_OLD-42f5394677a0a033e501f343cc3ccf02627e09d8.tar.xz
Added field LocalToGrid in UserAccount. Context: make HG work in Simian.
-rw-r--r--OpenSim/Services/Interfaces/IUserAccountService.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 6cc8eb8..4f80549 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -37,11 +37,13 @@ namespace OpenSim.Services.Interfaces
37 { 37 {
38 public UserAccount() 38 public UserAccount()
39 { 39 {
40 LocalToGrid = true;
40 } 41 }
41 42
42 public UserAccount(UUID principalID) 43 public UserAccount(UUID principalID)
43 { 44 {
44 PrincipalID = principalID; 45 PrincipalID = principalID;
46 LocalToGrid = true;
45 } 47 }
46 48
47 /// <summary> 49 /// <summary>
@@ -70,6 +72,7 @@ namespace OpenSim.Services.Interfaces
70 Email = email; 72 Email = email;
71 ServiceURLs = new Dictionary<string, object>(); 73 ServiceURLs = new Dictionary<string, object>();
72 Created = Util.UnixTimeSinceEpoch(); 74 Created = Util.UnixTimeSinceEpoch();
75 LocalToGrid = true;
73 } 76 }
74 77
75 public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email) 78 public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email)
@@ -81,6 +84,7 @@ namespace OpenSim.Services.Interfaces
81 Email = email; 84 Email = email;
82 ServiceURLs = new Dictionary<string, object>(); 85 ServiceURLs = new Dictionary<string, object>();
83 Created = Util.UnixTimeSinceEpoch(); 86 Created = Util.UnixTimeSinceEpoch();
87 LocalToGrid = true;
84 } 88 }
85 89
86 public string FirstName; 90 public string FirstName;
@@ -91,6 +95,7 @@ namespace OpenSim.Services.Interfaces
91 public int UserLevel; 95 public int UserLevel;
92 public int UserFlags; 96 public int UserFlags;
93 public string UserTitle; 97 public string UserTitle;
98 public Boolean LocalToGrid;
94 99
95 public Dictionary<string, object> ServiceURLs; 100 public Dictionary<string, object> ServiceURLs;
96 101
@@ -119,6 +124,8 @@ namespace OpenSim.Services.Interfaces
119 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString()); 124 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
120 if (kvp.ContainsKey("UserTitle")) 125 if (kvp.ContainsKey("UserTitle"))
121 UserTitle = kvp["UserTitle"].ToString(); 126 UserTitle = kvp["UserTitle"].ToString();
127 if (kvp.ContainsKey("LocalToGrid"))
128 Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid);
122 129
123 if (kvp.ContainsKey("Created")) 130 if (kvp.ContainsKey("Created"))
124 Created = Convert.ToInt32(kvp["Created"].ToString()); 131 Created = Convert.ToInt32(kvp["Created"].ToString());
@@ -152,6 +159,7 @@ namespace OpenSim.Services.Interfaces
152 result["UserLevel"] = UserLevel.ToString(); 159 result["UserLevel"] = UserLevel.ToString();
153 result["UserFlags"] = UserFlags.ToString(); 160 result["UserFlags"] = UserFlags.ToString();
154 result["UserTitle"] = UserTitle; 161 result["UserTitle"] = UserTitle;
162 result["LocalToGrid"] = LocalToGrid.ToString();
155 163
156 string str = string.Empty; 164 string str = string.Empty;
157 foreach (KeyValuePair<string, object> kvp in ServiceURLs) 165 foreach (KeyValuePair<string, object> kvp in ServiceURLs)