Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And now it actually compiles...

Browse Source
This commit is contained in:
Drake Arconis
2013-03-04 18:05:21 -05:00
parent c718bc4214
commit 5cf556fa09
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterdirectory.cpp
View File

@@ -105,7 +105,7 @@ public:
void handleRegionChange(LLTabContainer* container) void handleRegionChange(LLTabContainer* container)
{ {
if ((LLViewerRegion* region = gAgent.getRegion())) if (LLViewerRegion* region = gAgent.getRegion())
{ {
if (region->getFeaturesReceived()) if (region->getFeaturesReceived())
{ {
@@ -120,7 +120,7 @@ public:
void setMarketplaceURL(LLTabContainer* container) void setMarketplaceURL(LLTabContainer* container)
{ {
if ((LLViewerRegion* region = gAgent.getRegion())) if (LLViewerRegion* region = gAgent.getRegion())
{ {
LLSD info; LLSD info;
region->getSimulatorFeatures(info); region->getSimulatorFeatures(info);

16
indra/newview/llvovolume.cpp
View File

@@ -3044,10 +3044,12 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
} }
//build matrix palette //build matrix palette
LLMatrix4a mp[64]; static const size_t kMaxJoints = 64;
LLMatrix4a mp[kMaxJoints];
LLMatrix4* mat = (LLMatrix4*) mp; LLMatrix4* mat = (LLMatrix4*) mp;
U32 maxJoints = llmin(skin->mJointNames.size(), 64); U32 maxJoints = llmin(skin->mJointNames.size(), kMaxJoints);
for (U32 j = 0; j < maxJoints; ++j) for (U32 j = 0; j < maxJoints; ++j)
{ {
LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); LLJoint* joint = avatar->getJoint(skin->mJointNames[j]);
@@ -3107,13 +3109,9 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
LLMatrix4a src; LLMatrix4a src;
// Insure ref'd bone is in our clamped array of mats // Insure ref'd bone is in our clamped array of mats
llassert(idx[k] < 64); llassert(idx[k] < kMaxJoints);
// don't read garbage off the stack in release // clamp k to kMaxJoints to avoid reading garbage off stack in release
if (idx[k] < 64) src.setMul(mp[idx[(k < kMaxJoints) ? k : 0]], w);
{
src.setMul(mp[idx[k]], w);
}
final_mat.add(src); final_mat.add(src);
} }