* Appearance patches suite: These patches are applied to allow libomv bots to wear outfits in the future.
This functionality will be upstreamed later. ** Fixed call of new AvatarAppearance without arguments, which caused bots look like clouds of gas ** Added a SendAvatarData in ScenePresence.SetAppearance, which is expected after SetAppearance is run ** Fixed AssetXferUploader: CallbackID wasn't being passed on on multiple packets asset uploads ** Set VisualParams in AvatarAppearance to stop the alien looking bot from spawning and now looks a little better. *** TODO: Set better VisualParams value then 150 to everything0.6.5-rc1
parent
b52587ea6c
commit
6323516a83
|
@ -196,7 +196,7 @@ namespace OpenSim.Client.Linden
|
||||||
if (agent.Appearance == null)
|
if (agent.Appearance == null)
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
|
m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
|
||||||
agent.Appearance = new AvatarAppearance();
|
agent.Appearance = new AvatarAppearance(agent.AgentID);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_regionsConnector.RegionLoginsEnabled)
|
if (m_regionsConnector.RegionLoginsEnabled)
|
||||||
|
|
|
@ -242,6 +242,15 @@ namespace OpenSim.Framework
|
||||||
m_wearables[PANTS].ItemID = PANTS_ITEM;
|
m_wearables[PANTS].ItemID = PANTS_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual void SetDefaultParams(byte[] vparams)
|
||||||
|
{
|
||||||
|
// TODO: Figure out better values then 'fat scientist 150' or 'alien 0'
|
||||||
|
for (int i = 0; i < VISUALPARAM_COUNT; i++)
|
||||||
|
{
|
||||||
|
vparams[i] = 150;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected Primitive.TextureEntry m_texture;
|
protected Primitive.TextureEntry m_texture;
|
||||||
|
|
||||||
public virtual Primitive.TextureEntry Texture
|
public virtual Primitive.TextureEntry Texture
|
||||||
|
@ -280,6 +289,8 @@ namespace OpenSim.Framework
|
||||||
m_serial = 0;
|
m_serial = 0;
|
||||||
m_owner = owner;
|
m_owner = owner;
|
||||||
m_visualparams = new byte[VISUALPARAM_COUNT];
|
m_visualparams = new byte[VISUALPARAM_COUNT];
|
||||||
|
// This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist
|
||||||
|
SetDefaultParams(m_visualparams);
|
||||||
SetDefaultWearables();
|
SetDefaultWearables();
|
||||||
m_texture = GetDefaultTexture();
|
m_texture = GetDefaultTexture();
|
||||||
}
|
}
|
||||||
|
|
|
@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.Local
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
|
m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
|
||||||
agent.Appearance = new AvatarAppearance();
|
agent.Appearance = new AvatarAppearance(agent.AgentID);
|
||||||
}
|
}
|
||||||
|
|
||||||
TriggerExpectUser(regionHandle, agent);
|
TriggerExpectUser(regionHandle, agent);
|
||||||
|
|
|
@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
||||||
private UUID InventFolder = UUID.Zero;
|
private UUID InventFolder = UUID.Zero;
|
||||||
private sbyte invType = 0;
|
private sbyte invType = 0;
|
||||||
private bool m_createItem = false;
|
private bool m_createItem = false;
|
||||||
|
private uint m_createItemCallback = 0;
|
||||||
private string m_description = String.Empty;
|
private string m_description = String.Empty;
|
||||||
private bool m_dumpAssetToFile;
|
private bool m_dumpAssetToFile;
|
||||||
private bool m_finished = false;
|
private bool m_finished = false;
|
||||||
|
@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
||||||
m_finished = true;
|
m_finished = true;
|
||||||
if (m_createItem)
|
if (m_createItem)
|
||||||
{
|
{
|
||||||
DoCreateItem(0);
|
DoCreateItem(m_createItemCallback);
|
||||||
}
|
}
|
||||||
else if (m_storeLocal)
|
else if (m_storeLocal)
|
||||||
{
|
{
|
||||||
|
@ -205,6 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_createItem = true; //set flag so the inventory item is created when upload is complete
|
m_createItem = true; //set flag so the inventory item is created when upload is complete
|
||||||
|
m_createItemCallback = callbackID;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2389,6 +2389,11 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
UpdateMovementAnimations();
|
UpdateMovementAnimations();
|
||||||
m_startAnimationSet = true;
|
m_startAnimationSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Quaternion rot = m_bodyRot;
|
||||||
|
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
|
||||||
|
m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetWearable(int wearableId, AvatarWearable wearable)
|
public void SetWearable(int wearableId, AvatarWearable wearable)
|
||||||
|
|
Loading…
Reference in New Issue