diff options
author | Sean Dague | 2009-03-25 20:15:46 +0000 |
---|---|---|
committer | Sean Dague | 2009-03-25 20:15:46 +0000 |
commit | 6323516a834b5f3dc8056b4107e216c341a42166 (patch) | |
tree | 28a8a27afa123a36fe697e12fb99ba9646197b0c /OpenSim/Region | |
parent | iar: centralize user uuid gathering (diff) | |
download | opensim-SC_OLD-6323516a834b5f3dc8056b4107e216c341a42166.zip opensim-SC_OLD-6323516a834b5f3dc8056b4107e216c341a42166.tar.gz opensim-SC_OLD-6323516a834b5f3dc8056b4107e216c341a42166.tar.bz2 opensim-SC_OLD-6323516a834b5f3dc8056b4107e216c341a42166.tar.xz |
* 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 everything
Diffstat (limited to 'OpenSim/Region')
3 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index c52f825..2760b1e 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.Local | |||
320 | else | 320 | else |
321 | { | 321 | { |
322 | m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); | 322 | m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname); |
323 | agent.Appearance = new AvatarAppearance(); | 323 | agent.Appearance = new AvatarAppearance(agent.AgentID); |
324 | } | 324 | } |
325 | 325 | ||
326 | TriggerExpectUser(regionHandle, agent); | 326 | TriggerExpectUser(regionHandle, agent); |
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 7803209..8bdf084 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
43 | private UUID InventFolder = UUID.Zero; | 43 | private UUID InventFolder = UUID.Zero; |
44 | private sbyte invType = 0; | 44 | private sbyte invType = 0; |
45 | private bool m_createItem = false; | 45 | private bool m_createItem = false; |
46 | private uint m_createItemCallback = 0; | ||
46 | private string m_description = String.Empty; | 47 | private string m_description = String.Empty; |
47 | private bool m_dumpAssetToFile; | 48 | private bool m_dumpAssetToFile; |
48 | private bool m_finished = false; | 49 | private bool m_finished = false; |
@@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
148 | m_finished = true; | 149 | m_finished = true; |
149 | if (m_createItem) | 150 | if (m_createItem) |
150 | { | 151 | { |
151 | DoCreateItem(0); | 152 | DoCreateItem(m_createItemCallback); |
152 | } | 153 | } |
153 | else if (m_storeLocal) | 154 | else if (m_storeLocal) |
154 | { | 155 | { |
@@ -205,6 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
205 | else | 206 | else |
206 | { | 207 | { |
207 | m_createItem = true; //set flag so the inventory item is created when upload is complete | 208 | m_createItem = true; //set flag so the inventory item is created when upload is complete |
209 | m_createItemCallback = callbackID; | ||
208 | } | 210 | } |
209 | } | 211 | } |
210 | } | 212 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d6607b3..a6d1ad3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2389,6 +2389,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2389 | UpdateMovementAnimations(); | 2389 | UpdateMovementAnimations(); |
2390 | m_startAnimationSet = true; | 2390 | m_startAnimationSet = true; |
2391 | } | 2391 | } |
2392 | |||
2393 | Quaternion rot = m_bodyRot; | ||
2394 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, | ||
2395 | m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); | ||
2396 | |||
2392 | } | 2397 | } |
2393 | 2398 | ||
2394 | public void SetWearable(int wearableId, AvatarWearable wearable) | 2399 | public void SetWearable(int wearableId, AvatarWearable wearable) |