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

Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable.

Browse Source
This commit is contained in:
Shyotl
2011-07-23 03:26:30 -05:00
parent 179193d173
commit 1e92e734d8
29 changed files with 10133 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llviewerobject.cpp
View File

@@ -2999,7 +2999,12 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
getTEImage(i)->setBoostLevel(LLViewerTexture::BOOST_SELECTED);
}
if (isSculpted())
if (isSculpted()
#if MESH_ENABLED
&& !isMesh()
#endif //MESH_ENABLED
)
{
LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
LLUUID sculpt_id = sculpt_params->getSculptTexture();
@@ -3239,6 +3244,16 @@ const LLVector3 LLViewerObject::getPositionEdit() const
const LLVector3 LLViewerObject::getRenderPosition() const
{
#if MESH_ENABLED
if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
{
LLVOAvatar* avatar = getAvatar();
if (avatar)
{
return avatar->getPositionAgent();
}
}
#endif //MESH_ENABLED
if (mDrawable.isNull() || mDrawable->getGeneration() < 0)
{
return getPositionAgent();
@@ -3257,6 +3272,12 @@ const LLVector3 LLViewerObject::getPivotPositionAgent() const
const LLQuaternion LLViewerObject::getRenderRotation() const
{
LLQuaternion ret;
#if MESH_ENABLED
if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
{
return ret;
}
#endif //MESH_ENABLED
if (mDrawable.isNull() || mDrawable->isStatic())
{
ret = getRotationEdit();