diff options
| author | Richard Linden <none@none> | 2013-10-03 19:05:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-03 19:05:52 -0700 |
| commit | bee38adb347213bc1824dad8a762dc399c3065ec (patch) | |
| tree | b1db05808d35d0dcc168a799f8a2a47b6d1160e0 /indra/llcommon/indra_constants.cpp | |
| parent | 9ae025f8ee8688b25678a243ba19f1398de08060 (diff) | |
| parent | f8a85003ddd4bee1ae00fc329c1c1d66d6100cbd (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/indra_constants.cpp')
| -rwxr-xr-x | indra/llcommon/indra_constants.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp index b61dca3243..f3989ee1d0 100755 --- a/indra/llcommon/indra_constants.cpp +++ b/indra/llcommon/indra_constants.cpp @@ -66,4 +66,4 @@ const LLUUID TERRAIN_GRASS_DETAIL ("63338ede-0037-c4fd-855b-015d77112fc8"); // const LLUUID TERRAIN_MOUNTAIN_DETAIL ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER -const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
\ No newline at end of file +const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER |