diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
| commit | d6d2159bf875884bb060aaf8234478dd1ec478b4 (patch) | |
| tree | 6873979584b8d269fb250c35219725598cb9b5d6 /indra/llcommon/imageids.cpp | |
| parent | 960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull in viewer-release reflecting new release structure.
Diffstat (limited to 'indra/llcommon/imageids.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/imageids.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/imageids.cpp b/indra/llcommon/imageids.cpp index fe11465221..7d647e5c36 100644..100755 --- a/indra/llcommon/imageids.cpp +++ b/indra/llcommon/imageids.cpp @@ -68,3 +68,6 @@ const LLUUID TERRAIN_MOUNTAIN_DETAIL ("303cd381-8560-7579-23f1-f0a880799740"); / const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER + +const LLUUID IMG_CHECKERBOARD_RGBA ("2585a0f3-4163-6dd1-0f34-ad48cb909e25"); // dataserver + |