aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvotextbubble.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvotextbubble.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llvotextbubble.cpp b/linden/indra/newview/llvotextbubble.cpp
index dabcecb..d4af0da 100644
--- a/linden/indra/newview/llvotextbubble.cpp
+++ b/linden/indra/newview/llvotextbubble.cpp
@@ -45,6 +45,7 @@
45#include "llviewerimagelist.h" 45#include "llviewerimagelist.h"
46#include "llvolume.h" 46#include "llvolume.h"
47#include "pipeline.h" 47#include "pipeline.h"
48#include "llviewerregion.h"
48 49
49LLVOTextBubble::LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) 50LLVOTextBubble::LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
50: LLAlphaObject(id, pcode, regionp) 51: LLAlphaObject(id, pcode, regionp)
@@ -236,7 +237,7 @@ void LLVOTextBubble::getGeometry(S32 idx,
236 LLStrider<LLVector3>& normalsp, 237 LLStrider<LLVector3>& normalsp,
237 LLStrider<LLVector2>& texcoordsp, 238 LLStrider<LLVector2>& texcoordsp,
238 LLStrider<LLColor4U>& colorsp, 239 LLStrider<LLColor4U>& colorsp,
239 LLStrider<U32>& indicesp) 240 LLStrider<U16>& indicesp)
240{ 241{
241 if (idx == 0 || idx == 2) 242 if (idx == 0 || idx == 2)
242 { 243 {
@@ -265,5 +266,5 @@ void LLVOTextBubble::getGeometry(S32 idx,
265 266
266U32 LLVOTextBubble::getPartitionType() const 267U32 LLVOTextBubble::getPartitionType() const
267{ 268{
268 return LLPipeline::PARTITION_PARTICLE; 269 return LLViewerRegion::PARTITION_PARTICLE;
269} 270}