minor changes
parent
ac7187eada
commit
6c49f16132
|
@ -127,7 +127,7 @@ namespace OpenSim.Groups
|
|||
|
||||
m_debugEnabled = verbose;
|
||||
|
||||
MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
|
||||
MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
|
||||
}
|
||||
|
||||
public void RegionLoaded(Scene scene)
|
||||
|
|
|
@ -34,14 +34,13 @@ using OpenMetaverse;
|
|||
namespace OpenSim.Framework
|
||||
{
|
||||
[Flags]
|
||||
// this enum is stuck, can not be changed or will break compatibilty with any version older than that change
|
||||
public enum AssetFlags : int
|
||||
{
|
||||
Normal = 0, // Immutable asset
|
||||
Maptile = 1, // What it says
|
||||
Rewritable = 2, // Content can be rewritten
|
||||
Collectable = 4, // Can be GC'ed after some time
|
||||
|
||||
//AvatarBake = 0x8
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -1242,7 +1242,7 @@ namespace OpenSim.Framework
|
|||
|
||||
byte extraParamCount = data[0];
|
||||
int i = 1;
|
||||
for (int k = 0; k < extraParamCount; k++)
|
||||
for (int k = 0; k < extraParamCount; ++k)
|
||||
{
|
||||
byte epType = data[i];
|
||||
i += 6;
|
||||
|
|
|
@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
addFromAllowedDrop = (part.ParentGroup.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0;
|
||||
|
||||
part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
|
||||
part.ParentGroup.InvalidateEffectivePerms();
|
||||
part.ParentGroup.InvalidateDeepEffectivePerms();
|
||||
return true;
|
||||
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
|||
|
||||
m_debugEnabled = verbose;
|
||||
|
||||
MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
|
||||
MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
|
||||
}
|
||||
|
||||
public void RegionLoaded(Scene scene)
|
||||
|
|
|
@ -52,6 +52,5 @@ namespace OpenSim.Server.Handlers.Grid
|
|||
handlers.JsonGetGridInfoMethod));
|
||||
server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue