aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AssetBase.cs1
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs102
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
8 files changed, 68 insertions, 67 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index c3e4095..6296067 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Framework
36 private byte[] _data; 36 private byte[] _data;
37 private string _description = String.Empty; 37 private string _description = String.Empty;
38 private LLUUID _fullid; 38 private LLUUID _fullid;
39 private sbyte _invtype;
40 private bool _local = false; 39 private bool _local = false;
41 private string _name = String.Empty; 40 private string _name = String.Empty;
42 private bool _temporary = false; 41 private bool _temporary = false;
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 4bd2ad1..6ad72c0 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications
51 51
52 UserAgentData GetAgentByUUID(LLUUID userId); 52 UserAgentData GetAgentByUUID(LLUUID userId);
53 53
54 void clearUserAgent(LLUUID avatarID); 54 void ClearUserAgent(LLUUID avatarID);
55 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query); 55 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query);
56 56
57 UserProfileData SetupMasterUser(string firstName, string lastName); 57 UserProfileData SetupMasterUser(string firstName, string lastName);
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 1e059fe..d5b1e74 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Communications
96 96
97 if (profile != null) 97 if (profile != null)
98 { 98 {
99 profile.CurrentAgent = getUserAgent(profile.ID); 99 profile.CurrentAgent = GetUserAgent(profile.ID);
100 return profile; 100 return profile;
101 } 101 }
102 } 102 }
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications
126 126
127 if (null != profile) 127 if (null != profile)
128 { 128 {
129 profile.CurrentAgent = getUserAgent(profile.ID); 129 profile.CurrentAgent = GetUserAgent(profile.ID);
130 return profile; 130 return profile;
131 } 131 }
132 } 132 }
@@ -157,7 +157,7 @@ namespace OpenSim.Framework.Communications
157 /// </summary> 157 /// </summary>
158 /// <param name="data"></param> 158 /// <param name="data"></param>
159 /// <returns></returns> 159 /// <returns></returns>
160 public bool setUserProfile(UserProfileData data) 160 public bool SetUserProfile(UserProfileData data)
161 { 161 {
162 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 162 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
163 { 163 {
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Communications
183 /// </summary> 183 /// </summary>
184 /// <param name="uuid">The agent's UUID</param> 184 /// <param name="uuid">The agent's UUID</param>
185 /// <returns>Agent profiles</returns> 185 /// <returns>Agent profiles</returns>
186 public UserAgentData getUserAgent(LLUUID uuid) 186 public UserAgentData GetUserAgent(LLUUID uuid)
187 { 187 {
188 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 188 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
189 { 189 {
@@ -200,6 +200,51 @@ namespace OpenSim.Framework.Communications
200 return null; 200 return null;
201 } 201 }
202 202
203 /// <summary>
204 /// Loads a user agent by name (not called directly)
205 /// </summary>
206 /// <param name="name">The agent's name</param>
207 /// <returns>A user agent</returns>
208 public UserAgentData GetUserAgent(string name)
209 {
210 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
211 {
212 try
213 {
214 return plugin.Value.GetAgentByName(name);
215 }
216 catch (Exception e)
217 {
218 m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
219 }
220 }
221
222 return null;
223 }
224
225 /// <summary>
226 /// Loads a user agent by name (not called directly)
227 /// </summary>
228 /// <param name="fname">The agent's firstname</param>
229 /// <param name="lname">The agent's lastname</param>
230 /// <returns>A user agent</returns>
231 public UserAgentData GetUserAgent(string fname, string lname)
232 {
233 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
234 {
235 try
236 {
237 return plugin.Value.GetAgentByName(fname, lname);
238 }
239 catch (Exception e)
240 {
241 m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
242 }
243 }
244
245 return null;
246 }
247
203 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 248 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
204 { 249 {
205 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 250 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -297,62 +342,19 @@ namespace OpenSim.Framework.Communications
297 } 342 }
298 } 343 }
299 344
300 /// <summary>
301 /// Loads a user agent by name (not called directly)
302 /// </summary>
303 /// <param name="name">The agent's name</param>
304 /// <returns>A user agent</returns>
305 public UserAgentData getUserAgent(string name)
306 {
307 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
308 {
309 try
310 {
311 return plugin.Value.GetAgentByName(name);
312 }
313 catch (Exception e)
314 {
315 m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
316 }
317 }
318
319 return null;
320 }
321 345
322 /// <summary> 346 /// <summary>
323 /// Resets the currentAgent in the user profile 347 /// Resets the currentAgent in the user profile
324 /// </summary> 348 /// </summary>
325 /// <param name="agentID">The agent's ID</param> 349 /// <param name="agentID">The agent's ID</param>
326 public void clearUserAgent(LLUUID agentID) 350 public void ClearUserAgent(LLUUID agentID)
327 { 351 {
328 UserProfileData profile = GetUserProfile(agentID); 352 UserProfileData profile = GetUserProfile(agentID);
329 profile.CurrentAgent = null; 353 profile.CurrentAgent = null;
330 354
331 setUserProfile(profile); 355 SetUserProfile(profile);
332 } 356 }
333 357
334 /// <summary>
335 /// Loads a user agent by name (not called directly)
336 /// </summary>
337 /// <param name="fname">The agent's firstname</param>
338 /// <param name="lname">The agent's lastname</param>
339 /// <returns>A user agent</returns>
340 public UserAgentData getUserAgent(string fname, string lname)
341 {
342 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
343 {
344 try
345 {
346 return plugin.Value.GetAgentByName(fname, lname);
347 }
348 catch (Exception e)
349 {
350 m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
351 }
352 }
353
354 return null;
355 }
356 358
357 #endregion 359 #endregion
358 360
@@ -537,7 +539,7 @@ namespace OpenSim.Framework.Communications
537 // TODO: what is the logic should be? 539 // TODO: what is the logic should be?
538 bool ret = false; 540 bool ret = false;
539 ret = AddUserAgent(profile.CurrentAgent); 541 ret = AddUserAgent(profile.CurrentAgent);
540 ret = ret & setUserProfile(profile); 542 ret = ret & SetUserProfile(profile);
541 return ret; 543 return ret;
542 } 544 }
543 545
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 949aa27..3dbce5b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1139,17 +1139,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1139 /// <param name="map">heightmap</param> 1139 /// <param name="map">heightmap</param>
1140 /// <param name="px">X coordinate for patches 0..12</param> 1140 /// <param name="px">X coordinate for patches 0..12</param>
1141 /// <param name="py">Y coordinate for patches 0..15</param> 1141 /// <param name="py">Y coordinate for patches 0..15</param>
1142 private void SendLayerPacket(float[] map, int y, int x) 1142 // private void SendLayerPacket(float[] map, int y, int x)
1143 { 1143 // {
1144 int[] patches = new int[4]; 1144 // int[] patches = new int[4];
1145 patches[0] = x + 0 + y * 16; 1145 // patches[0] = x + 0 + y * 16;
1146 patches[1] = x + 1 + y * 16; 1146 // patches[1] = x + 1 + y * 16;
1147 patches[2] = x + 2 + y * 16; 1147 // patches[2] = x + 2 + y * 16;
1148 patches[3] = x + 3 + y * 16; 1148 // patches[3] = x + 3 + y * 16;
1149 1149
1150 Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1150 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
1151 OutPacket(layerpack, ThrottleOutPacketType.Land); 1151 // OutPacket(layerpack, ThrottleOutPacketType.Land);
1152 } 1152 // }
1153 1153
1154 /// <summary> 1154 /// <summary>
1155 /// Sends a specified patch to a client 1155 /// Sends a specified patch to a client
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 7afec37..307751e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Region.Communications.OGS1
388 } 388 }
389 389
390 390
391 public void clearUserAgent(LLUUID avatarID) 391 public void ClearUserAgent(LLUUID avatarID)
392 { 392 {
393 // TODO: implement 393 // TODO: implement
394 } 394 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index da93890..b9bf42b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment.Scenes
664 664
665 public void ClearUserAgent(LLUUID avatarID) 665 public void ClearUserAgent(LLUUID avatarID)
666 { 666 {
667 m_commsProvider.UserService.clearUserAgent(avatarID); 667 m_commsProvider.UserService.ClearUserAgent(avatarID);
668 } 668 }
669 669
670 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 670 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
index dfd802a..c7fda9c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
@@ -18656,7 +18656,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
18656 case 1020: { } 18656 case 1020: { }
18657 break; 18657 break;
18658 case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } 18658 case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
18659 break; 18659 // break;
18660 case 1069: ; 18660 case 1069: ;
18661 break; 18661 break;
18662 case 1073: ; 18662 case 1073: ;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index cbc5112..82d00a5 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1387,7 +1387,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1387 1387
1388 public void ApiResetScript() 1388 public void ApiResetScript()
1389 { 1389 {
1390 bool running = Running; 1390 // bool running = Running;
1391 1391
1392 RemoveState(); 1392 RemoveState();
1393 1393