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

minor changes

master
UbitUmarov 2020-05-07 02:15:25 +01:00
parent ac7187eada
commit 6c49f16132
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Addons/Groups/GroupsModule.cs
View File

@ -127,7 +127,7 @@ namespace OpenSim.Groups
m_debugEnabled = verbose; 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) public void RegionLoaded(Scene scene)

3
OpenSim/Framework/AssetBase.cs
View File

@ -34,14 +34,13 @@ using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
[Flags] [Flags]
// this enum is stuck, can not be changed or will break compatibilty with any version older than that change
public enum AssetFlags : int public enum AssetFlags : int
{ {
Normal = 0, // Immutable asset Normal = 0, // Immutable asset
Maptile = 1, // What it says Maptile = 1, // What it says
Rewritable = 2, // Content can be rewritten Rewritable = 2, // Content can be rewritten
Collectable = 4, // Can be GC'ed after some time Collectable = 4, // Can be GC'ed after some time
//AvatarBake = 0x8
} }
/// <summary> /// <summary>

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -1242,7 +1242,7 @@ namespace OpenSim.Framework
byte extraParamCount = data[0]; byte extraParamCount = data[0];
int i = 1; int i = 1;
for (int k = 0; k < extraParamCount; k++) for (int k = 0; k < extraParamCount; ++k)
{ {
byte epType = data[i]; byte epType = data[i];
i += 6; i += 6;

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -204,7 +204,7 @@ namespace OpenSim.Region.Framework.Scenes
addFromAllowedDrop = (part.ParentGroup.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0; addFromAllowedDrop = (part.ParentGroup.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0;
part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop); part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
part.ParentGroup.InvalidateEffectivePerms(); part.ParentGroup.InvalidateDeepEffectivePerms();
return true; return true;
} }

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_debugEnabled = verbose; 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) public void RegionLoaded(Scene scene)

1
OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
View File

@ -52,6 +52,5 @@ namespace OpenSim.Server.Handlers.Grid
handlers.JsonGetGridInfoMethod)); handlers.JsonGetGridInfoMethod));
server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod); server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
} }
} }
} }