diff options
| author | McCabe Maxsted | 2010-08-16 16:55:04 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-16 16:55:04 -0700 |
| commit | d76b75c113857ec50aa4896e9b3bd8c6d1cb06eb (patch) | |
| tree | 8c8884384270fcdf7a2517b544fd93a20639fd00 /linden/indra/newview/pipeline.cpp | |
| parent | Load IMG_DEFAULT_SELECTED locally rather than from the server (fixes the sele... (diff) | |
| download | meta-impy-d76b75c113857ec50aa4896e9b3bd8c6d1cb06eb.zip meta-impy-d76b75c113857ec50aa4896e9b3bd8c6d1cb06eb.tar.gz meta-impy-d76b75c113857ec50aa4896e9b3bd8c6d1cb06eb.tar.bz2 meta-impy-d76b75c113857ec50aa4896e9b3bd8c6d1cb06eb.tar.xz | |
Load other missing UUIDs from OpenSim from file instead
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 05459ad..6b00ca6 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -2448,7 +2448,7 @@ void LLPipeline::renderHighlights() | |||
| 2448 | if (!mFaceSelectImagep) | 2448 | if (!mFaceSelectImagep) |
| 2449 | { | 2449 | { |
| 2450 | // Load the select texture texture from file -- MC | 2450 | // Load the select texture texture from file -- MC |
| 2451 | mFaceSelectImagep = gImageList.getImageFromFile("a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c", TRUE, TRUE); /*gImageList.getImage(IMG_FACE_SELECT);*/ | 2451 | mFaceSelectImagep = gImageList.getImageFromFile(IMG_FACE_SELECT.asString()+".j2c", TRUE, TRUE); /*gImageList.getImage(IMG_FACE_SELECT);*/ |
| 2452 | } | 2452 | } |
| 2453 | mFaceSelectImagep->addTextureStats((F32)MAX_IMAGE_AREA); | 2453 | mFaceSelectImagep->addTextureStats((F32)MAX_IMAGE_AREA); |
| 2454 | 2454 | ||