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

HG2.0: Generalized the allowed HG appearances to be more than 1.

connector_plugin
Diva Canto 2012-09-16 16:45:57 -07:00
parent daa4745fb7
commit 380962d359
1 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,19 +56,27 @@ 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>();
m_Attachs = new List<AvatarAttachment>();
string[] names = m_AccountName.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string name in names)
{
string[] parts = name.Trim().Split();
if (parts.Length != 2) if (parts.Length != 2)
{ {
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Wrong user account name format {0}. Specify 'First Last'", m_AccountName); m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Wrong user account name format {0}. Specify 'First Last'", name);
return null; return null;
} }
UserAccount account = Scene.UserAccountService.GetUserAccount(UUID.Zero, parts[0], parts[1]); UserAccount account = Scene.UserAccountService.GetUserAccount(UUID.Zero, parts[0], parts[1]);
@ -77,20 +85,25 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unknown account {0}", m_AccountName); m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unknown account {0}", m_AccountName);
return null; return null;
} }
m_ExportedAppearance = Scene.AvatarService.GetAppearance(account.PrincipalID); AvatarAppearance a = Scene.AvatarService.GetAppearance(account.PrincipalID);
if (m_ExportedAppearance != null) if (a != null)
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Successfully retrieved appearance for {0}", m_AccountName); m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Successfully retrieved appearance for {0}", name);
foreach (AvatarAttachment att in m_ExportedAppearance.GetAttachments()) foreach (AvatarAttachment att in a.GetAttachments())
{ {
InventoryItemBase item = new InventoryItemBase(att.ItemID, account.PrincipalID); InventoryItemBase item = new InventoryItemBase(att.ItemID, account.PrincipalID);
item = Scene.InventoryService.GetItem(item); item = Scene.InventoryService.GetItem(item);
if (item != null) if (item != null)
m_ExportedAppearance.SetAttachment(att.AttachPoint, att.ItemID, item.AssetID); a.SetAttachment(att.AttachPoint, att.ItemID, item.AssetID);
else else
m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to retrieve item {0} from inventory", att.ItemID); m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to retrieve item {0} from inventory {1}", att.ItemID, name);
} }
return m_ExportedAppearance;
m_ExportedAppearances.Add(a);
m_Attachs.AddRange(a.GetAttachments());
}
return m_ExportedAppearances;
} }
} }
@ -270,13 +283,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;
@ -285,11 +314,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)
{ {