summaryrefslogtreecommitdiff
path: root/indra/llcommon/indra_constants.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-19 23:02:37 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-19 23:02:37 +0300
commitb25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (patch)
tree968ce9657026035901b3604b012f7dff96a2d122 /indra/llcommon/indra_constants.cpp
parent8243301b3ff6c90db6d1fb53baf5050666d75d9a (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
+