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

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
avinationmerge
Melanie 2012-09-17 14:15:22 +01:00
parent 66bf1376b5 c7948a669a
commit 1dd75fcdb4
3 changed files with 71 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -56,41 +56,54 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected bool m_RestrictAppearanceAbroad; protected bool m_RestrictAppearanceAbroad;
protected string m_AccountName; protected string m_AccountName;
protected AvatarAppearance m_ExportedAppearance; protected List<AvatarAppearance> m_ExportedAppearances;
protected List<AvatarAttachment> m_Attachs;
protected AvatarAppearance ExportedAppearance protected List<AvatarAppearance> ExportedAppearance
{ {
get get
{ {
if (m_ExportedAppearance != null) if (m_ExportedAppearances != null)
return m_ExportedAppearance; return m_ExportedAppearances;
string[] parts = m_AccountName.Split(); m_ExportedAppearances = new List<AvatarAppearance>();
if (parts.Length != 2) m_Attachs = new List<AvatarAttachment>();
{
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Wrong user account name format {0}. Specify 'First Last'", m_AccountName);
return null;
}
UserAccount account = Scene.UserAccountService.GetUserAccount(UUID.Zero, parts[0], parts[1]);
if (account == null)
{
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unknown account {0}", m_AccountName);
return null;
}
m_ExportedAppearance = Scene.AvatarService.GetAppearance(account.PrincipalID);
if (m_ExportedAppearance != null)
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Successfully retrieved appearance for {0}", m_AccountName);
foreach (AvatarAttachment att in m_ExportedAppearance.GetAttachments()) string[] names = m_AccountName.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string name in names)
{ {
InventoryItemBase item = new InventoryItemBase(att.ItemID, account.PrincipalID); string[] parts = name.Trim().Split();
item = Scene.InventoryService.GetItem(item); if (parts.Length != 2)
if (item != null) {
m_ExportedAppearance.SetAttachment(att.AttachPoint, att.ItemID, item.AssetID); m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Wrong user account name format {0}. Specify 'First Last'", name);
else return null;
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to retrieve item {0} from inventory", att.ItemID); }
UserAccount account = Scene.UserAccountService.GetUserAccount(UUID.Zero, parts[0], parts[1]);
if (account == null)
{
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unknown account {0}", m_AccountName);
return null;
}
AvatarAppearance a = Scene.AvatarService.GetAppearance(account.PrincipalID);
if (a != null)
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Successfully retrieved appearance for {0}", name);
foreach (AvatarAttachment att in a.GetAttachments())
{
InventoryItemBase item = new InventoryItemBase(att.ItemID, account.PrincipalID);
item = Scene.InventoryService.GetItem(item);
if (item != null)
a.SetAttachment(att.AttachPoint, att.ItemID, item.AssetID);
else
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to retrieve item {0} from inventory {1}", att.ItemID, name);
}
m_ExportedAppearances.Add(a);
m_Attachs.AddRange(a.GetAttachments());
} }
return m_ExportedAppearance;
return m_ExportedAppearances;
} }
} }
@ -275,13 +288,29 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (sp.Appearance.Wearables[i] == null) if (sp.Appearance.Wearables[i] == null)
continue; continue;
if (ExportedAppearance.Wearables[i] == null) bool found = false;
foreach (AvatarAppearance a in ExportedAppearance)
if (a.Wearables[i] != null)
{
found = true;
break;
}
if (!found)
{ {
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i); m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
return false; return false;
} }
if (sp.Appearance.Wearables[i][j].AssetID != ExportedAppearance.Wearables[i][j].AssetID) found = false;
foreach (AvatarAppearance a in ExportedAppearance)
if (sp.Appearance.Wearables[i][j].AssetID == a.Wearables[i][j].AssetID)
{
found = true;
break;
}
if (!found)
{ {
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i); m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
return false; return false;
@ -290,11 +319,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
// Check attachments // Check attachments
foreach (AvatarAttachment att in sp.Appearance.GetAttachments()) foreach (AvatarAttachment att in sp.Appearance.GetAttachments())
{ {
bool found = false; bool found = false;
foreach (AvatarAttachment att2 in ExportedAppearance.GetAttachments()) foreach (AvatarAttachment att2 in m_Attachs)
{ {
if (att2.AssetID == att.AssetID) if (att2.AssetID == att.AssetID)
{ {

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -5943,6 +5943,9 @@ Environment.Exit(1);
public string GetExtraSetting(string name) public string GetExtraSetting(string name)
{ {
if (m_extraSettings == null)
return String.Empty;
string val; string val;
if (!m_extraSettings.TryGetValue(name, out val)) if (!m_extraSettings.TryGetValue(name, out val))

18
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
View File

@ -130,37 +130,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val)); SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val));
} }
private void llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint) private int llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint)
{ {
SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host); SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host);
if (hostPart == null) if (hostPart == null)
return; return 0;
if (hostPart.ParentGroup.IsAttachment) if (hostPart.ParentGroup.IsAttachment)
return; return 0;
IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>(); IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>();
if (attachmentsModule == null) if (attachmentsModule == null)
return; return 0;
TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script); TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script);
if (item == null) if (item == null)
return; return 0;
if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH
return; return 0;
ScenePresence target; ScenePresence target;
if (!m_scene.TryGetScenePresence(item.PermsGranter, out target)) if (!m_scene.TryGetScenePresence(item.PermsGranter, out target))
return; return 0;
if (target.UUID != hostPart.ParentGroup.OwnerID) if (target.UUID != hostPart.ParentGroup.OwnerID)
{ {
uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions(); uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions();
if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
return; return 0;
hostPart.ParentGroup.SetOwnerId(target.UUID); hostPart.ParentGroup.SetOwnerId(target.UUID);
hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId); hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId);
@ -183,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
} }
attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true); return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true) ? 1 : 0;
} }
} }
} }