summaryrefslogtreecommitdiff
path: root/indra/llcommon/indra_constants.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-20 00:03:30 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-20 00:03:30 +0300
commit445cd962932c1957495a35add8cf5ca4618e035b (patch)
treed0303f3704acb804cb8281f3b7c38010afa423e6 /indra/llcommon/indra_constants.cpp
parent6f5f307e0a751a78fbdfb4c6a1f8757ea55bf1dd (diff)
parentc2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
-rw-r--r--[-rwxr-xr-x]indra/llcommon/indra_constants.cpp1
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
+