ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

misspell all across the board

Browse Source
This commit is contained in:
UbitUmarov
2020-06-18 12:01:53 +01:00
parent 104f7f0eb2
commit 44c90bf294
14 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (folder == null || folder.Owner != remoteClient.AgentId)
return;
if (transactionID != UUID.Zero)
if (transactionID != UUID.Zero && assetType != (byte)AssetType.Settings)
{
IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule;
if (agentTransactions != null)
@@ -228,13 +228,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
if(assetType == (byte)AssetType.Settings)
{
/* this is wrong subtype may need to be checked
if(data == null)
{
IEnvironmentModule envModule = m_Scene.RequestModuleInterface<IEnvironmentModule>();
if(envModule == null)
return;
data = envModule.GetDefaultAssetData(name);
data = envModule.GetDefaultAssetData(subType);
if(data == null)
{
m_log.ErrorFormat(
@@ -242,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
return;
}
}
*/
flags = subType;
}
else if( assetType == (byte)AssetType.Clothing ||
@@ -1057,14 +1056,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (!attachment)
{
// If it's rezzed in world, select it. Much easier to
// find small items.
//
foreach (SceneObjectPart part in group.Parts)
if(RezSelected)
{
part.CreateSelected = true;
group.IsSelected = true;
group.RootPart.CreateSelected = true;
}
if (rootPart.Shape.PCode == (byte)PCode.Prim)
group.ClearPartAttachmentData();
}