diff options
Diffstat (limited to '')
6 files changed, 39 insertions, 39 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 8ca4296..7891c29 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.GridServer | |||
43 | public class GridServerBase : BaseOpenSimServer, conscmd_callback | 43 | public class GridServerBase : BaseOpenSimServer, conscmd_callback |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | protected GridConfig m_config; | 47 | protected GridConfig m_config; |
48 | protected GridManager m_gridManager; | 48 | protected GridManager m_gridManager; |
49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); | 49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); |
@@ -121,12 +121,12 @@ namespace OpenSim.Grid.GridServer | |||
121 | // Temporary hack to stop mono-addins scanning warnings from coming out on the console | 121 | // Temporary hack to stop mono-addins scanning warnings from coming out on the console |
122 | TextWriter oldOutput = Console.Out; | 122 | TextWriter oldOutput = Console.Out; |
123 | Console.SetOut(new StreamWriter(Stream.Null)); | 123 | Console.SetOut(new StreamWriter(Stream.Null)); |
124 | 124 | ||
125 | AddinManager.Initialize("."); | 125 | AddinManager.Initialize("."); |
126 | AddinManager.Registry.Update(null); | 126 | AddinManager.Registry.Update(null); |
127 | 127 | ||
128 | // Returns the console.writelines back to the console's stream | 128 | // Returns the console.writelines back to the console's stream |
129 | Console.SetOut(oldOutput); | 129 | Console.SetOut(oldOutput); |
130 | 130 | ||
131 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); | 131 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); |
132 | foreach (TypeExtensionNode node in nodes) | 132 | foreach (TypeExtensionNode node in nodes) |
@@ -175,7 +175,7 @@ namespace OpenSim.Grid.GridServer | |||
175 | catch | 175 | catch |
176 | { | 176 | { |
177 | } | 177 | } |
178 | 178 | ||
179 | if (SimResponse == "OK") | 179 | if (SimResponse == "OK") |
180 | { | 180 | { |
181 | m_simProfileManager.SimProfiles[sim.UUID].online = true; | 181 | m_simProfileManager.SimProfiles[sim.UUID].online = true; |
@@ -187,11 +187,11 @@ namespace OpenSim.Grid.GridServer | |||
187 | } | 187 | } |
188 | */ | 188 | */ |
189 | } | 189 | } |
190 | 190 | ||
191 | public override void Shutdown() | 191 | public override void Shutdown() |
192 | { | 192 | { |
193 | foreach (IGridPlugin plugin in m_plugins) plugin.Close(); | 193 | foreach (IGridPlugin plugin in m_plugins) plugin.Close(); |
194 | 194 | ||
195 | base.Shutdown(); | 195 | base.Shutdown(); |
196 | } | 196 | } |
197 | } | 197 | } |
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 0abb89d..cec596f 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -67,12 +67,12 @@ namespace OpenSim.Grid.MessagingServer | |||
67 | UserConfig uc = new UserConfig(); | 67 | UserConfig uc = new UserConfig(); |
68 | uc.DatabaseConnect = cfg.DatabaseConnect; | 68 | uc.DatabaseConnect = cfg.DatabaseConnect; |
69 | uc.DatabaseProvider = cfg.DatabaseProvider; | 69 | uc.DatabaseProvider = cfg.DatabaseProvider; |
70 | 70 | ||
71 | m_userManager._config = uc; | 71 | m_userManager._config = uc; |
72 | m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); | 72 | m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); |
73 | } | 73 | } |
74 | 74 | ||
75 | 75 | ||
76 | 76 | ||
77 | #region FriendList Methods | 77 | #region FriendList Methods |
78 | 78 | ||
@@ -152,7 +152,7 @@ namespace OpenSim.Grid.MessagingServer | |||
152 | friendlistupdater.OnDone += PresenceUpdateDone; | 152 | friendlistupdater.OnDone += PresenceUpdateDone; |
153 | WaitCallback cb = new WaitCallback(friendlistupdater.go); | 153 | WaitCallback cb = new WaitCallback(friendlistupdater.go); |
154 | ThreadPool.QueueUserWorkItem(cb); | 154 | ThreadPool.QueueUserWorkItem(cb); |
155 | 155 | ||
156 | } | 156 | } |
157 | else | 157 | else |
158 | { | 158 | { |
@@ -173,7 +173,7 @@ namespace OpenSim.Grid.MessagingServer | |||
173 | { | 173 | { |
174 | // we need to send out online status update, but the user is already subscribed | 174 | // we need to send out online status update, but the user is already subscribed |
175 | } | 175 | } |
176 | 176 | ||
177 | UserAgentData p2Handle = m_userManager.GetUserAgentData(friendpresence.agentData.AgentID); | 177 | UserAgentData p2Handle = m_userManager.GetUserAgentData(friendpresence.agentData.AgentID); |
178 | 178 | ||
179 | if (p2Handle != null) | 179 | if (p2Handle != null) |
@@ -196,7 +196,7 @@ namespace OpenSim.Grid.MessagingServer | |||
196 | // skip, agent doesn't appear to exist anymore | 196 | // skip, agent doesn't appear to exist anymore |
197 | } | 197 | } |
198 | 198 | ||
199 | 199 | ||
200 | 200 | ||
201 | //SendRegionPresenceUpdate(userpresence, friendpresence); | 201 | //SendRegionPresenceUpdate(userpresence, friendpresence); |
202 | } | 202 | } |
@@ -315,8 +315,8 @@ namespace OpenSim.Grid.MessagingServer | |||
315 | UserAgentData p2Handle = m_userManager.GetUserAgentData(friendd.agentData.AgentID); | 315 | UserAgentData p2Handle = m_userManager.GetUserAgentData(friendd.agentData.AgentID); |
316 | if (p2Handle != null) | 316 | if (p2Handle != null) |
317 | { | 317 | { |
318 | 318 | ||
319 | 319 | ||
320 | friendd.regionData.regionHandle = p2Handle.Handle; | 320 | friendd.regionData.regionHandle = p2Handle.Handle; |
321 | PresenceInformer friendlistupdater = new PresenceInformer(); | 321 | PresenceInformer friendlistupdater = new PresenceInformer(); |
322 | friendlistupdater.presence1 = AgentData; | 322 | friendlistupdater.presence1 = AgentData; |
@@ -328,11 +328,11 @@ namespace OpenSim.Grid.MessagingServer | |||
328 | 328 | ||
329 | friendlistupdater.OnGetRegionData += GetRegionInfo; | 329 | friendlistupdater.OnGetRegionData += GetRegionInfo; |
330 | friendlistupdater.OnDone += PresenceUpdateDone; | 330 | friendlistupdater.OnDone += PresenceUpdateDone; |
331 | 331 | ||
332 | WaitCallback cb3 = new WaitCallback(friendlistupdater.go); | 332 | WaitCallback cb3 = new WaitCallback(friendlistupdater.go); |
333 | ThreadPool.QueueUserWorkItem(cb3); | 333 | ThreadPool.QueueUserWorkItem(cb3); |
334 | 334 | ||
335 | 335 | ||
336 | 336 | ||
337 | } | 337 | } |
338 | else | 338 | else |
@@ -519,14 +519,14 @@ namespace OpenSim.Grid.MessagingServer | |||
519 | else | 519 | else |
520 | { | 520 | { |
521 | // Don't lock the cache while we're looking up the region! | 521 | // Don't lock the cache while we're looking up the region! |
522 | lookup = true; | 522 | lookup = true; |
523 | } | 523 | } |
524 | } | 524 | } |
525 | 525 | ||
526 | if (lookup) | 526 | if (lookup) |
527 | { | 527 | { |
528 | regionInfo = RequestRegionInfo(regionhandle); | 528 | regionInfo = RequestRegionInfo(regionhandle); |
529 | 529 | ||
530 | if (regionInfo != null) | 530 | if (regionInfo != null) |
531 | { | 531 | { |
532 | lock (m_regionInfoCache) | 532 | lock (m_regionInfoCache) |
@@ -542,7 +542,7 @@ namespace OpenSim.Grid.MessagingServer | |||
542 | } | 542 | } |
543 | } | 543 | } |
544 | } | 544 | } |
545 | 545 | ||
546 | return regionInfo; | 546 | return regionInfo; |
547 | } | 547 | } |
548 | 548 | ||
@@ -555,7 +555,7 @@ namespace OpenSim.Grid.MessagingServer | |||
555 | cachecount = m_regionInfoCache.Count; | 555 | cachecount = m_regionInfoCache.Count; |
556 | m_regionInfoCache.Clear(); | 556 | m_regionInfoCache.Clear(); |
557 | } | 557 | } |
558 | 558 | ||
559 | return cachecount; | 559 | return cachecount; |
560 | } | 560 | } |
561 | 561 | ||
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs index 3e35f20..e02aa06 100644 --- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs +++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs | |||
@@ -36,13 +36,13 @@ namespace OpenSim.Grid.MessagingServer | |||
36 | { | 36 | { |
37 | public delegate RegionProfileData GetRegionData(ulong region_handle); | 37 | public delegate RegionProfileData GetRegionData(ulong region_handle); |
38 | public delegate void Done(PresenceInformer obj); | 38 | public delegate void Done(PresenceInformer obj); |
39 | 39 | ||
40 | 40 | ||
41 | public class PresenceInformer | 41 | public class PresenceInformer |
42 | { | 42 | { |
43 | public event GetRegionData OnGetRegionData; | 43 | public event GetRegionData OnGetRegionData; |
44 | public event Done OnDone; | 44 | public event Done OnDone; |
45 | 45 | ||
46 | private GetRegionData handlerGetRegionData = null; | 46 | private GetRegionData handlerGetRegionData = null; |
47 | private Done handlerDone = null; | 47 | private Done handlerDone = null; |
48 | 48 | ||
@@ -102,10 +102,10 @@ namespace OpenSim.Grid.MessagingServer | |||
102 | PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString()); | 102 | PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString()); |
103 | if (TalkingAbout.OnlineYN) | 103 | if (TalkingAbout.OnlineYN) |
104 | PresenceParams.Add("status","TRUE"); | 104 | PresenceParams.Add("status","TRUE"); |
105 | else | 105 | else |
106 | PresenceParams.Add("status","FALSE"); | 106 | PresenceParams.Add("status","FALSE"); |
107 | 107 | ||
108 | 108 | ||
109 | 109 | ||
110 | 110 | ||
111 | ArrayList SendParams = new ArrayList(); | 111 | ArrayList SendParams = new ArrayList(); |
@@ -123,12 +123,12 @@ namespace OpenSim.Grid.MessagingServer | |||
123 | catch (WebException) | 123 | catch (WebException) |
124 | { | 124 | { |
125 | m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname); | 125 | m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname); |
126 | } | 126 | } |
127 | } | 127 | } |
128 | else | 128 | else |
129 | { | 129 | { |
130 | m_log.Info("[PRESENCEUPDATER]: Region data was null skipping"); | 130 | m_log.Info("[PRESENCEUPDATER]: Region data was null skipping"); |
131 | 131 | ||
132 | } | 132 | } |
133 | 133 | ||
134 | handlerDone = OnDone; | 134 | handlerDone = OnDone; |
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs index 605c3fb..de41756 100644 --- a/OpenSim/Grid/MessagingServer/UserManager.cs +++ b/OpenSim/Grid/MessagingServer/UserManager.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Grid.MessagingServer | |||
44 | public UserAgentData GetUserAgentData(LLUUID AgentID) | 44 | public UserAgentData GetUserAgentData(LLUUID AgentID) |
45 | { | 45 | { |
46 | UserProfileData userProfile = GetUserProfile(AgentID); | 46 | UserProfileData userProfile = GetUserProfile(AgentID); |
47 | 47 | ||
48 | if (userProfile != null) | 48 | if (userProfile != null) |
49 | { | 49 | { |
50 | return userProfile.CurrentAgent; | 50 | return userProfile.CurrentAgent; |
@@ -58,19 +58,19 @@ namespace OpenSim.Grid.MessagingServer | |||
58 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 58 | public override UserProfileData SetupMasterUser(string firstName, string lastName) |
59 | { | 59 | { |
60 | //throw new Exception("The method or operation is not implemented."); | 60 | //throw new Exception("The method or operation is not implemented."); |
61 | return null; | 61 | return null; |
62 | } | 62 | } |
63 | 63 | ||
64 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) | 64 | public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) |
65 | { | 65 | { |
66 | //throw new Exception("The method or operation is not implemented."); | 66 | //throw new Exception("The method or operation is not implemented."); |
67 | return null; | 67 | return null; |
68 | } | 68 | } |
69 | 69 | ||
70 | public override UserProfileData SetupMasterUser(LLUUID uuid) | 70 | public override UserProfileData SetupMasterUser(LLUUID uuid) |
71 | { | 71 | { |
72 | //throw new Exception("The method or operation is not implemented."); | 72 | //throw new Exception("The method or operation is not implemented."); |
73 | return null; | 73 | return null; |
74 | } | 74 | } |
75 | } | 75 | } |
76 | } | 76 | } |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index ad1b989..9cd3fb1 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -224,14 +224,14 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler | |||
224 | LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw); | 224 | LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw); |
225 | LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw); | 225 | LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw); |
226 | LSL_Types.Quaternion a = new LSL_Types.Quaternion(); | 226 | LSL_Types.Quaternion a = new LSL_Types.Quaternion(); |
227 | //This multiplication doesnt compile, yet. a = a1 * a2 * a3; | 227 | //This multiplication doesn't compile, yet. a = a1 * a2 * a3; |
228 | LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz, | 228 | LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz, |
229 | aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw, | 229 | aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw, |
230 | aw*bw*cw - ax*by*cz); | 230 | aw*bw*cw - ax*by*cz); |
231 | LSL_Types.Quaternion c = new LSL_Types.Quaternion(); | 231 | LSL_Types.Quaternion c = new LSL_Types.Quaternion(); |
232 | //This addition doesnt compile yet c = a + b; | 232 | //This addition doesn't compile yet c = a + b; |
233 | LSL_Types.Quaternion d = new LSL_Types.Quaternion(); | 233 | LSL_Types.Quaternion d = new LSL_Types.Quaternion(); |
234 | //This addition doesnt compile yet d = a - b; | 234 | //This addition doesn't compile yet d = a - b; |
235 | if ((Math.Abs(c.X) > err && Math.Abs(d.X) > err) || | 235 | if ((Math.Abs(c.X) > err && Math.Abs(d.X) > err) || |
236 | (Math.Abs(c.Y) > err && Math.Abs(d.Y) > err) || | 236 | (Math.Abs(c.Y) > err && Math.Abs(d.Y) > err) || |
237 | (Math.Abs(c.Z) > err && Math.Abs(d.Z) > err) || | 237 | (Math.Abs(c.Z) > err && Math.Abs(d.Z) > err) || |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index a78876c..907a530 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -430,9 +430,9 @@ namespace OpenSim.Grid.UserServer | |||
430 | if (requestData.Contains("avatar_uuid")) | 430 | if (requestData.Contains("avatar_uuid")) |
431 | { | 431 | { |
432 | LLUUID guess = LLUUID.Zero; | 432 | LLUUID guess = LLUUID.Zero; |
433 | 433 | ||
434 | Helpers.TryParse((string)requestData["avatar_uuid"],out guess); | 434 | Helpers.TryParse((string)requestData["avatar_uuid"],out guess); |
435 | 435 | ||
436 | if (guess == LLUUID.Zero) | 436 | if (guess == LLUUID.Zero) |
437 | { | 437 | { |
438 | return CreateUnknownUserErrorResponse(); | 438 | return CreateUnknownUserErrorResponse(); |
@@ -444,7 +444,7 @@ namespace OpenSim.Grid.UserServer | |||
444 | { | 444 | { |
445 | return CreateUnknownUserErrorResponse(); | 445 | return CreateUnknownUserErrorResponse(); |
446 | } | 446 | } |
447 | 447 | ||
448 | // no agent??? | 448 | // no agent??? |
449 | if (userProfile.CurrentAgent == null) | 449 | if (userProfile.CurrentAgent == null) |
450 | { | 450 | { |
@@ -456,7 +456,7 @@ namespace OpenSim.Grid.UserServer | |||
456 | responseData["session"]=userProfile.CurrentAgent.SessionID.ToString(); | 456 | responseData["session"]=userProfile.CurrentAgent.SessionID.ToString(); |
457 | if (userProfile.CurrentAgent.AgentOnline) | 457 | if (userProfile.CurrentAgent.AgentOnline) |
458 | responseData["agent_online"]="TRUE"; | 458 | responseData["agent_online"]="TRUE"; |
459 | else | 459 | else |
460 | responseData["agent_online"]="FALSE"; | 460 | responseData["agent_online"]="FALSE"; |
461 | 461 | ||
462 | response.Value = responseData; | 462 | response.Value = responseData; |