diff options
| author | McCabe Maxsted | 2010-08-16 13:52:28 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-16 13:52:28 -0700 |
| commit | 00946b825d1e1eab656f5cbf5d570b3dab9c8b40 (patch) | |
| tree | b37dd1a8ce27d0f1891c309ee10dd198af443f2b | |
| parent | Incremented LLTextureCache::sHeaderCacheVersion to 1.3 and cache_version to 7... (diff) | |
| download | meta-impy-00946b825d1e1eab656f5cbf5d570b3dab9c8b40.zip meta-impy-00946b825d1e1eab656f5cbf5d570b3dab9c8b40.tar.gz meta-impy-00946b825d1e1eab656f5cbf5d570b3dab9c8b40.tar.bz2 meta-impy-00946b825d1e1eab656f5cbf5d570b3dab9c8b40.tar.xz | |
Load IMG_DEFAULT_SELECTED locally rather than from the server (fixes the select texture image missing on OpenSim-based grids bug)
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index e36e296..05459ad 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -2447,7 +2447,8 @@ void LLPipeline::renderHighlights() | |||
| 2447 | // Make sure the selection image gets downloaded and decoded | 2447 | // Make sure the selection image gets downloaded and decoded |
| 2448 | if (!mFaceSelectImagep) | 2448 | if (!mFaceSelectImagep) |
| 2449 | { | 2449 | { |
| 2450 | mFaceSelectImagep = gImageList.getImage(IMG_FACE_SELECT); | 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 | } | 2452 | } |
| 2452 | mFaceSelectImagep->addTextureStats((F32)MAX_IMAGE_AREA); | 2453 | mFaceSelectImagep->addTextureStats((F32)MAX_IMAGE_AREA); |
| 2453 | 2454 | ||