aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvotextbubble.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/newview/llvotextbubble.cpp
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/newview/llvotextbubble.cpp')
-rw-r--r--linden/indra/newview/llvotextbubble.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvotextbubble.cpp b/linden/indra/newview/llvotextbubble.cpp
index d4af0da..4f5ca38 100644
--- a/linden/indra/newview/llvotextbubble.cpp
+++ b/linden/indra/newview/llvotextbubble.cpp
@@ -61,7 +61,7 @@ LLVOTextBubble::LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRe
61 volume_params.setBeginAndEndT(0.f, 1.f); 61 volume_params.setBeginAndEndT(0.f, 1.f);
62 volume_params.setRatio(0.25f, 0.25f); 62 volume_params.setRatio(0.25f, 0.25f);
63 volume_params.setShear(0.f, 0.f); 63 volume_params.setShear(0.f, 0.f);
64 setVolume(volume_params); 64 setVolume(volume_params, 0);
65 mColor = LLColor4(1.0f, 0.0f, 0.0f, 1.f); 65 mColor = LLColor4(1.0f, 0.0f, 0.0f, 1.f);
66 S32 i; 66 S32 i;
67 for (i = 0; i < getNumTEs(); i++) 67 for (i = 0; i < getNumTEs(); i++)
@@ -165,8 +165,8 @@ LLDrawable *LLVOTextBubble::createDrawable(LLPipeline *pipeline)
165 return mDrawable; 165 return mDrawable;
166} 166}
167 167
168 168// virtual
169BOOL LLVOTextBubble::setVolume(const LLVolumeParams &volume_params) 169BOOL LLVOTextBubble::setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume)
170{ 170{
171 if (LLPrimitive::setVolume(volume_params, mLOD)) 171 if (LLPrimitive::setVolume(volume_params, mLOD))
172 { 172 {
@@ -194,7 +194,7 @@ BOOL LLVOTextBubble::updateGeometry(LLDrawable *drawable)
194 if (mVolumeChanged) 194 if (mVolumeChanged)
195 { 195 {
196 LLVolumeParams volume_params = getVolume()->getParams(); 196 LLVolumeParams volume_params = getVolume()->getParams();
197 setVolume(volume_params); 197 setVolume(volume_params, 0);
198 198
199 LLPipeline::sCompiles++; 199 LLPipeline::sCompiles++;
200 200