OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.1-post-fixes
Jeff Ames 2008-11-15 02:21:52 +00:00
parent 00d6114525
commit e40fe2db26
5 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
View File

@ -38,10 +38,8 @@ using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {
public class IRCBridgeModule : IRegionModule public class IRCBridgeModule : IRegionModule
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -70,13 +68,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public void Initialise(Scene scene, IConfigSource config) public void Initialise(Scene scene, IConfigSource config)
{ {
// Do a once-only scan of the configuration file to make // Do a once-only scan of the configuration file to make
// sure it's basically intact. // sure it's basically intact.
if (!configured) if (!configured)
{ {
configured = true; configured = true;
try try
@ -106,7 +102,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
password = config.Configs["RemoteAdmin"].GetString("access_password", password); password = config.Configs["RemoteAdmin"].GetString("access_password", password);
scene.CommsManager.HttpServer.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false); scene.CommsManager.HttpServer.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false);
} }
} }
// Iff the IRC bridge is enabled, then each new region may be // Iff the IRC bridge is enabled, then each new region may be
@ -122,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {
m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName); m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName);
region = new RegionState(scene, m_config); region = new RegionState(scene, m_config);
lock(m_regions) m_regions.Add(region); lock (m_regions) m_regions.Add(region);
region.Open(); region.Open();
} }
catch (Exception e) catch (Exception e)
@ -135,7 +130,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {
m_log.WarnFormat("[IRC-Bridge] Not enabled. Connect for region {0} ignored", scene.RegionInfo.RegionName); m_log.WarnFormat("[IRC-Bridge] Not enabled. Connect for region {0} ignored", scene.RegionInfo.RegionName);
} }
} }
// This module can be called in-flight in which case PostInitialize // This module can be called in-flight in which case PostInitialize
@ -144,7 +138,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public void PostInitialise() public void PostInitialise()
{ {
} }
// Called immediately before the region module is unloaded. Cleanup // Called immediately before the region module is unloaded. Cleanup
@ -152,20 +145,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
public void Close() public void Close()
{ {
if (!enabled) if (!enabled)
return; return;
region.Close(); region.Close();
lock(m_regions) m_regions.Remove(region); lock (m_regions) m_regions.Remove(region);
} }
#endregion #endregion
public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request) public static XmlRpcResponse XmlRpcAdminMethod(XmlRpcRequest request)
{ {
m_log.Info("[IRC-Bridge]: XML RPC Admin Entry"); m_log.Info("[IRC-Bridge]: XML RPC Admin Entry");
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
@ -173,7 +163,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
try try
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
bool found = false; bool found = false;
string region = String.Empty; string region = String.Empty;
@ -209,7 +198,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
if (!found) throw new Exception(String.Format("Region <{0}> not found", region)); if (!found) throw new Exception(String.Format("Region <{0}> not found", region));
responseData["success"] = true; responseData["success"] = true;
} }
catch (Exception e) catch (Exception e)
{ {
@ -217,7 +205,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
responseData["success"] = "false"; responseData["success"] = "false";
responseData["error"] = e.Message; responseData["error"] = e.Message;
} }
finally finally
{ {
@ -227,9 +214,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
m_log.Debug("[IRC-Bridge]: XML RPC Admin Exit"); m_log.Debug("[IRC-Bridge]: XML RPC Admin Exit");
return response; return response;
} }
} }
} }

2
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1263,7 +1263,7 @@ namespace OpenSim.Region.Environment.Scenes
// them update an item unless they pass the external checks // them update an item unless they pass the external checks
// //
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId) if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)
&& (currentItem != null || !allowInventoryDrop )) && (currentItem != null || !allowInventoryDrop))
return; return;
if (currentItem == null) if (currentItem == null)