aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-10-11 22:41:59 +0100
committerUbitUmarov2014-10-11 22:41:59 +0100
commitc3e88b7b3810aace6e2260526d8f74df88d2cead (patch)
tree3d9785b551646316ff796e4475785505d13f61a9 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
parent dont let test mesh go to meshes inventory folder that is not displayed by (diff)
downloadopensim-SC-c3e88b7b3810aace6e2260526d8f74df88d2cead.zip
opensim-SC-c3e88b7b3810aace6e2260526d8f74df88d2cead.tar.gz
opensim-SC-c3e88b7b3810aace6e2260526d8f74df88d2cead.tar.bz2
opensim-SC-c3e88b7b3810aace6e2260526d8f74df88d2cead.tar.xz
changed skeleton, do parse the mesh on upload to check skeleton. Sooner or
later this parsing needs to validate the model cost also.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index db6f9fd..546bcd9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -99,15 +99,13 @@ namespace OpenSim.Region.ClientStack.Linden
99 // avatarSkeleton if mesh includes a avatar skeleton 99 // avatarSkeleton if mesh includes a avatar skeleton
100 // useAvatarCollider if we should use physics mesh for avatar 100 // useAvatarCollider if we should use physics mesh for avatar
101 public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost, 101 public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost,
102 LLSDAssetUploadResponseData meshcostdata,out bool avatarSkeleton, out bool useAvatarCollider, 102 LLSDAssetUploadResponseData meshcostdata, out string error, ref string warning)
103 out string error, ref string warning)
104 { 103 {
105 totalcost = 0; 104 totalcost = 0;
106 error = string.Empty; 105 error = string.Empty;
107 106
108 avatarSkeleton = false; 107 bool avatarSkeleton = false;
109 useAvatarCollider = false; 108
110
111 if (resources == null || 109 if (resources == null ||
112 resources.instance_list == null || 110 resources.instance_list == null ||
113 resources.instance_list.Array.Count == 0) 111 resources.instance_list.Array.Count == 0)