diff options
author | UbitUmarov | 2014-10-11 10:22:57 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-11 10:22:57 +0100 |
commit | dab2e778d6a9d11cce48161d045598a56e7de952 (patch) | |
tree | 440184457c292c3c34899e9e03a97e1a10240052 /OpenSim/Region/ClientStack/Linden/Caps | |
parent | check for avatar skeleton data on meshs headers on cost estimation. Dont (diff) | |
download | opensim-SC-dab2e778d6a9d11cce48161d045598a56e7de952.zip opensim-SC-dab2e778d6a9d11cce48161d045598a56e7de952.tar.gz opensim-SC-dab2e778d6a9d11cce48161d045598a56e7de952.tar.bz2 opensim-SC-dab2e778d6a9d11cce48161d045598a56e7de952.tar.xz |
bug fix
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 3a070c3..133a629 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -830,7 +830,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
830 | List<UUID> textures = new List<UUID>(); | 830 | List<UUID> textures = new List<UUID>(); |
831 | 831 | ||
832 | 832 | ||
833 | if (doTextInv) | 833 | // if (doTextInv) |
834 | if (doTextInv || avatarSkeleton) | ||
834 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | 835 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); |
835 | 836 | ||
836 | if(client == null) // don't put textures in inventory if there is no client | 837 | if(client == null) // don't put textures in inventory if there is no client |
@@ -903,7 +904,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
903 | 904 | ||
904 | 905 | ||
905 | // test code | 906 | // test code |
906 | if (avatarSkeleton) | 907 | if (avatarSkeleton && client != null) |
907 | { | 908 | { |
908 | string name = assetName; | 909 | string name = assetName; |
909 | if (name.Length > 25) | 910 | if (name.Length > 25) |