aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorlbsa712008-02-25 15:36:24 +0000
committerlbsa712008-02-25 15:36:24 +0000
commit5b3897a4af247a14dfd36fa00bb6999e0a1078d5 (patch)
tree7e70f5fdc18f458c813808ab5ef5486a80ea9604 /OpenSim/Region/Environment/Scenes
parentUpdated paths in classaudit script. (diff)
downloadopensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.zip
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.gz
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.bz2
opensim-SC_OLD-5b3897a4af247a14dfd36fa00bb6999e0a1078d5.tar.xz
* Caught HttpListenerException and swallowed if with output
* Moved Flush into Close since it's always done in that order. * Minor renamings * Reversed if for clarity
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4f44d36..1088fc1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1397,7 +1397,7 @@ namespace OpenSim.Region.Environment.Scenes
1397 client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest; 1397 client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest;
1398 client.OnEstateCovenantRequest += m_estateManager.HandleEstateCovenantRequest; 1398 client.OnEstateCovenantRequest += m_estateManager.HandleEstateCovenantRequest;
1399 client.OnRequestGodlikePowers += handleRequestGodlikePowers; 1399 client.OnRequestGodlikePowers += handleRequestGodlikePowers;
1400 client.OnGodKickUser += handleGodlikeKickUser; 1400 client.OnGodKickUser += HandleGodlikeKickUser;
1401 client.OnObjectPermissions += HandleObjectPermissionsUpdate; 1401 client.OnObjectPermissions += HandleObjectPermissionsUpdate;
1402 1402
1403 client.OnCreateNewInventoryItem += CreateNewInventoryItem; 1403 client.OnCreateNewInventoryItem += CreateNewInventoryItem;
@@ -2188,7 +2188,7 @@ namespace OpenSim.Region.Environment.Scenes
2188 /// <param name="agentID">the person that is being kicked</param> 2188 /// <param name="agentID">the person that is being kicked</param>
2189 /// <param name="kickflags">This isn't used apparently</param> 2189 /// <param name="kickflags">This isn't used apparently</param>
2190 /// <param name="reason">The message to send to the user after it's been turned into a field</param> 2190 /// <param name="reason">The message to send to the user after it's been turned into a field</param>
2191 public void handleGodlikeKickUser(LLUUID godID, LLUUID sessionID, LLUUID agentID, uint kickflags, byte[] reason) 2191 public void HandleGodlikeKickUser(LLUUID godID, LLUUID sessionID, LLUUID agentID, uint kickflags, byte[] reason)
2192 { 2192 {
2193 // For some reason the client sends this seemingly hard coded UUID for kicking everyone. Dun-know. 2193 // For some reason the client sends this seemingly hard coded UUID for kicking everyone. Dun-know.
2194 LLUUID kickUserID = new LLUUID("44e87126e7944ded05b37c42da3d5cdb"); 2194 LLUUID kickUserID = new LLUUID("44e87126e7944ded05b37c42da3d5cdb");