diff options
| author | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
| commit | 05fcb7c8126a3f3496d948affe7f2722c9ca8fad (patch) | |
| tree | 159e542492c5c1fab1a04ef8a29b22fd60e4766a /indra/llcommon/indra_constants.cpp | |
| parent | 50ab1e57ec21f2009013b3bc061047887cdd07d5 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/llcommon/indra_constants.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp index f3989ee1d0..60721977cd 100755..100644 --- a/indra/llcommon/indra_constants.cpp +++ b/indra/llcommon/indra_constants.cpp @@ -67,3 +67,4 @@ 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 + |