diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 5c434f4bf..4acdc6426 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -33,8 +33,8 @@ else (STANDALONE) optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib ) set(APRUTIL_LIBRARIES - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib ) set(APRICONV_LIBRARIES iconv) else (WINDOWS) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 6babb05fd..8a3620b47 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -40,10 +40,10 @@ else (STANDALONE) debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) elseif (DARWIN) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-mt) + set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) + set(BOOST_REGEX_LIBRARY boost_regex) + set(BOOST_SYSTEM_LIBRARY boost_system) elseif (LINUX) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 365df6783..363f061b5 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -6,7 +6,7 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(hunspell) - set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) + set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell) if (LINUX OR DARWIN) set(HUNSPELL_LIBRARY hunspell-1.3) diff --git a/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml b/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml new file mode 100644 index 000000000..20a528235 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml @@ -0,0 +1,20 @@ + + + + 0.24652767181396484 + [Tarnix] Ultrabright Night + + + 0.24999989569187164 + [Tarnix] Ultrabright Morning + + + 0.49652755260467529 + [Tarnix] Ultrabright Day + + + 0.90277743339538574 + [Tarnix] Ultrabright Night + + + diff --git a/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml b/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml new file mode 100644 index 000000000..6e7de2f0a --- /dev/null +++ b/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml @@ -0,0 +1,36 @@ + + + + 0 + Realistic Night + + + 0.12499994784593582 + Realistic 3AM + + + 0.24652767181396484 + Realistic 6AM + + + 0.37499985098838806 + A-9AM + + + 0.49999979138374329 + Realistic + + + 0.62499970197677612 + A-3PM + + + 0.74999970197677612 + Realistic 6PM + + + 0.87499958276748657 + Realistic 9PM + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml new file mode 100644 index 000000000..68af1523e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.0462114512920379638671875 + 0.05376493558287620544433594 + 0.0709760487079620361328125 + 0.02365868352353572845458984 + + blue_density + + 0.1467447141720501502248908 + 0.4041820112504588280444295 + 0.8083723277382617311559443 + 1 + + blue_horizon + + 0.2301578534514239215980069 + 0.3007703710769140670322486 + 0.3251373821004301944981307 + 1 + + cloud_color + + 0.2784517256901799520107943 + 0.2784517256901799520107943 + 0.2784517256901799520107943 + 1 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.9492304265646138716761016 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.3682807419706036755613354 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.69985902430791213646444 + 10.50173369741952456024592 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 0.0004900000058114528656005859 + 0 + 0 + 1 + + distance_multiplier + + 12.90000057220458984375 + 0 + 0 + 1 + + east_angle + 2.45044231414794921875 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.87999999523162841796875 + 0 + 0 + 1 + + glow + + 0.799999237060546875 + 0.001000000047497451305389404 + -1.19999992847442626953125 + 1 + + haze_density + + 3.5 + 0 + 0 + 1 + + haze_horizon + + 0.199999988079071044921875 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0.529998958110809326171875 + 0.555569469928741455078125 + -0.640658795833587646484375 + 0 + + max_y + + 1333 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.589999973773956298828125 + sun_angle + 0.5890476703643798828125 + sunlight_color + + 1.397439671540726457976689 + 1.479949096350015480538787 + 2.570202271922596537478967 + 0.9015665961795940042122766 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml new file mode 100644 index 000000000..558092242 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.01848458126187324523925781 + 0.02150597609579563140869141 + 0.02839041873812675476074219 + 0.009463473223149776458740234 + + blue_density + + 0.1467447141720501502248908 + 0.4041820112504588280444295 + 0.8083723277382617311559443 + 1 + + blue_horizon + + 0.2301578534514239215980069 + 0.3007703710769140670322486 + 0.3251373821004301944981307 + 1 + + cloud_color + + 0.2784517256901799520107943 + 0.2784517256901799520107943 + 0.2784517256901799520107943 + 1 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.9492304265646138716761016 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.3682807419706036755613354 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.69985902430791213646444 + 10.50173369741952456024592 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 0.0004900000058114528656005859 + 0 + 0 + 1 + + distance_multiplier + + 12.90000057220458984375 + 0 + 0 + 1 + + east_angle + 2.19911479949951171875 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.09000003337860107421875 + 0 + 0 + 1 + + glow + + 4.867557667375535856990609 + 0.001000000047497451305389404 + -0.4737372158712260805657479 + 1 + + haze_density + + 3.5 + 0 + 0 + 1 + + haze_horizon + + 0.199999988079071044921875 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0.6726734638214111328125 + 0.555569469928741455078125 + -0.4887258112430572509765625 + 0 + + max_y + + 1333 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.589999973773956298828125 + sun_angle + 0.5890476703643798828125 + sunlight_color + + 1.397439671540726457976689 + 1.479949096350015480538787 + 2.570202271922596537478967 + 0.9015665961795940042122766 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml new file mode 100644 index 000000000..2b2645a41 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.22705078125 + 0.0897216796875 + 0.00732421875 + 0.07568359375 + + blue_density + + 0.171875 + 0.171875 + 0.171875 + 0.0859375 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00060999998822808266 + 0 + 0 + 1 + + distance_multiplier + + 46.900001525878906 + 0 + 0 + 1 + + east_angle + 5.1522121429443359 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.26999998092651367 + 0 + 0 + 1 + + glow + + 12.799999237060547 + 0.0010000000474974513 + -0.99999994039535522 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.86294835805892944 + 0.30070748925209045 + -0.40607285499572754 + 0 + + max_y + + 427 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0.81000000238418579 + sun_angle + 2.836158275604248 + sunlight_color + + 1.08233642578125 + 1.07391357421875 + 1.07391357421875 + 0.36077880859375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml new file mode 100644 index 000000000..39a0395b9 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.50390625 + 0.50390625 + 0.50390625 + 0.16796875 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.47999998927116394 + 0.53999996185302734 + 0.45999997854232788 + 0.53999996185302734 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 3.958406925201416 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 15.59999942779541 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.29358875751495361 + 0.91531205177307129 + 0.27569809556007385 + 0 + + max_y + + 483 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 1.9853105545043945 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml new file mode 100644 index 000000000..9f5d6be1d --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.0099999997764825821 + 0 + 0 + 0.0099999997764825821 + + blue_density + + 0.68000000715255737 + 0.49999505281448364 + 1 + 1 + + blue_horizon + + 0.070000000298023224 + 0.85394656658172607 + 1 + 1 + + cloud_color + + 0.53962135314941406 + 0.53962135314941406 + 0.53962135314941406 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.69569224119186401 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.10999999195337296 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.3765256404876709 + 0 + 0 + 1 + + density_multiplier + + 0.0004099999787285924 + 0 + 0 + 1 + + distance_multiplier + + 12.800000190734863 + 0 + 0 + 1 + + east_angle + 2.1991147994995117 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0199999809265137 + 0 + 0 + 1 + + glow + + 5.3999996185302734 + 0.0010000000474974513 + -0.39999997615814209 + 1 + + haze_density + + 2.9500000476837158 + 0 + 0 + 1 + + haze_horizon + + 0.45999997854232788 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.68231838941574097 + 0.53729885816574097 + -0.49573326110839844 + 0 + + max_y + + 1352.0999755859375 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0 + sun_angle + 0.56723111867904663 + sunlight_color + + 0.77999997138977051 + 1.2300000190734863 + 1.2300000190734863 + 0.40999999642372131 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml new file mode 100644 index 000000000..bacfab520 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0.05468752607703208923339844 + 0.109375 + 0.0546875 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.5396213531494140625 + 0.5396213531494140625 + 0.5396213531494140625 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.695692241191864013671875 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.1099999919533729553222656 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.3765256404876708984375 + 0 + 0 + 1 + + density_multiplier + + 0.0004099999787285923957824707 + 0 + 0 + 1 + + distance_multiplier + + 12.80000019073486328125 + 0 + 0 + 1 + + east_angle + 5.026547908782958984375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 17.799999237060546875 + 0.001000000047497451305389404 + -0.4999999701976776123046875 + 1 + + haze_density + + 2.9500000476837158203125 + 0 + 0 + 1 + + haze_horizon + + 0.459999978542327880859375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0.79077517986297607421875 + 0.555569469928741455078125 + 0.2569381296634674072265625 + 0 + + max_y + + 1352.0999755859375 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0 + sun_angle + 0.5890476703643798828125 + sunlight_color + + 2.8857421875 + 1.8592071533203125 + 0.8642578125 + 0.9619140625 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml new file mode 100644 index 000000000..e053815be --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.21194984018802643 + 0.25700280070304871 + 0.25999999046325684 + 0.25999999046325684 + + blue_density + + 0.10031381994485855 + 0.2849995493888855 + 0.56999999284744263 + 0.56999999284744263 + + blue_horizon + + 0.15806557238101959 + 0.31211116909980774 + 0.52999997138977051 + 0.52999997138977051 + + cloud_color + + 0.62000000476837158 + 0.72737622261047363 + 0.73626559972763062 + 1 + + cloud_pos_density1 + + 0.89999997615814209 + 0.93999999761581421 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.11999999731779099 + 0.20999999344348907 + 0.029999999329447746 + 1 + + cloud_scale + + 0.25999999046325684 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.993240904292179 + 10.010000228881836 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 10.100000381469727 + 0 + 0 + 1 + + east_angle + 3.8955750465393066 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.4699999094009399 + 0 + 0 + 1 + + glow + + 11.200000762939453 + 0.0010000000474974513 + -0.64999997615814209 + 1 + + haze_density + + 0.35999998450279236 + 0 + 0 + 1 + + haze_horizon + + 0.11999999731779099 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.66304093599319458 + 0.24868990480899811 + -0.70606660842895508 + 0 + + max_y + + 789 + 0 + 0 + 1 + + preset_num + 24 + star_brightness + 0.18999999761581421 + sun_angle + 0.25132742524147034 + sunlight_color + + 2.25 + 1.2599999904632568 + 0.59999996423721313 + 2.25 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml new file mode 100644 index 000000000..77db3cf7e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.36328125 + 0.321533203125 + 0.22265625 + 0.12109375 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 4.2725663185119629 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.46939900517463684 + 0.85491263866424561 + 0.22088223695755005 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.1162102222442627 + sunlight_color + + 2.4300000667572021 + 2.0399999618530273 + 1.8600000143051147 + 2.4300000667572021 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml new file mode 100644 index 000000000..0f1b712b7 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.5859375 + 0.5859375 + 0.5859375 + 0.1953125 + + blue_density + + 0.2447581589221954345703125 + 0.4487232863903045654296875 + 0.7599999904632568359375 + 0.37999999523162841796875 + + blue_horizon + + 0.6136362552642822265625 + 0.6136362552642822265625 + 0.8549020290374755859375 + 0.42745101451873779296875 + + cloud_color + + 0.4099999964237213134765625 + 0.4099999964237213134765625 + 0.4099999964237213134765625 + 0.4099999964237213134765625 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.4199999868869781494140625 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.19999980926513671875 + 10.0109996795654296875 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 9.999999747378751635551453e-05 + 0 + 0 + 1 + + distance_multiplier + + 0.4000000059604644775390625 + 0 + 0 + 1 + + east_angle + 3.1415927410125732421875 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.769999980926513671875 + 0 + 0 + 1 + + glow + + 5 + 0.001000000047497451305389404 + -1.10000002384185791015625 + 1 + + haze_density + + 0.88999998569488525390625 + 0 + 0 + 1 + + haze_horizon + + 0.1599999964237213134765625 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 1.003947020460603523073218e-13 + 1 + -1.148381556959066074341536e-06 + 0 + + max_y + + 1493 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.57079517841339111328125 + sunlight_color + + 2.1299998760223388671875 + 1.8660809993743896484375 + 1.490999698638916015625 + 0.709999978542327880859375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml new file mode 100644 index 000000000..aebeff534 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.24475815892219543 + 0.44872328639030457 + 0.75999999046325684 + 0.37999999523162842 + + blue_horizon + + 0.49548381567001343 + 0.49548381567001343 + 0.63999998569488525 + 0.31999999284744263 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1 + 0.96999996900558472 + 0.08999999612569809 + 1 + + cloud_scale + + 0.40999996662139893 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.359999656677246 + 10.340000152587891 + + cloud_shadow + + 0.2800000011920929 + 0 + 0 + 1 + + density_multiplier + + 9.9999997473787516e-006 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.1000000238418579 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -1.1000000238418579 + 1 + + haze_density + + 3.5 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0 + 1 + 0 + + max_y + + 667 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.1299999952316284 + sun_angle + 6.2395515441894531 + sunlight_color + + 1.6986236572265625 + 1.1374046802520752 + 0.4810638427734375 + 0.5662078857421875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml new file mode 100644 index 000000000..cd8ead3e8 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.3486154782113272121435443 + 0.449369331229434954000368 + 0.603132514577153000523424 + 0.6937349534321981536777457 + + blue_horizon + + 0.3662028399132433720275515 + 0.3662028399731497851909978 + 0.4375903419326376275755308 + 0.6640963995887574355947436 + + cloud_color + + 0.3169694886788358978435554 + 0.3169694886788358978435554 + 0.3169694886788358978435554 + 0.7085542303539185127192468 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.9392771101574294290159628 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.4199999868869781494140625 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.35150370716937828774462 + 10.01099989455784466940713 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 0.0002012048324333540389764752 + 0 + 0 + 1 + + distance_multiplier + + 0.1975903555777060727205452 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.00100000003430226265706271 + -0.4799999904774563952436495 + 1 + + haze_density + + 2.463735011225950621849279 + 0 + 0 + 1 + + haze_horizon + + 0.07903613876588544417955973 + 0.199156002811505972172057 + 0.199156002811505972172057 + 1 + + lightnorm + + 0 + 0.59130990505218505859375 + -0.8064444065093994140625 + 1 + + max_y + + 1196.065065097033084384748 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 5.6505031585693359375 + sunlight_color + + 0.08699999749660491943359375 + 0.118706881999969482421875 + 0.2129999846220016479492188 + 0.07099999487400054931640625 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml b/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml new file mode 100644 index 000000000..6426f907d --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.22259476780891418 + 0.26450252532958984 + 0.35999998450279236 + 0.11999999731779099 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0.23999616268583132 + 0.239999227803052 + 0.24000028550619668 + 1 + + cloud_color + + 0.22615400241566114 + 0.22615400241566114 + 0.22615400241566114 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.88000000953681223 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400354105791 + 10.011000104419489 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.0003000046529240592 + 0 + 0 + 1 + + distance_multiplier + + 7 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000023022 + 0.0010000000214220922 + -0.47999999165507345 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 4.6348559691012062e-006 + 0.19915600437461423 + 0.19915600437461423 + 1 + + lightnorm + + -0 + 1 + 2.3722609512333293e-006 + 1 + + max_y + + 906.19008370909478 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999420642852783 + sun_angle + 4.7123866081237793 + sunlight_color + + 0.11344550549983978 + 0.11571422964334488 + 0.21467949450016022 + 0.071559831500053406 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml b/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml new file mode 100644 index 000000000..86e799464 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.80999994277954102 + 0.46289783716201782 + 0.62999993562698364 + 0.26999998092651367 + + blue_density + + 0.30247950553894043 + 0.83312696218490601 + 1.6662704944610596 + 0.83313524723052979 + + blue_horizon + + 0.20673196017742157 + 0.40988314151763916 + 0.47999998927116394 + 0.47999998927116394 + + cloud_color + + 0.22616604226328718 + 0.22616604226328718 + 0.22616604226328718 + 0.99997219085526012 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.88000025272481253 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013883861 + 10.010999679576344 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00056000001495704055 + 0 + 0 + 1 + + distance_multiplier + + 0.69999998807907104 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 4.6000003814697266 + 0.0010000000474974513 + -0.94999998807907104 + 1 + + haze_density + + 0.66999995708465576 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.094108223915100098 + 0.99556195735931396 + 0 + + max_y + + 877 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.094247691333293915 + sunlight_color + + 2.8055419921875 + 2.5958919525146484 + 2.3507080078125 + 0.9351806640625 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml b/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml new file mode 100644 index 000000000..c74da5417 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.58785861730575562 + 0.46682888269424438 + 0.46682891249656677 + 0.1959528774023056 + + blue_density + + 0.18964982032775879 + 0.52235734462738037 + 1.0447251796722412 + 0.52236258983612061 + + blue_horizon + + 0.11289128661155701 + 0.22382725775241852 + 0.26210871338844299 + 0.1310543566942215 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00052999996114522219 + 0 + 0 + 1 + + distance_multiplier + + 0.69999998807907104 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 1.8000006675720215 + 0.0010000000474974513 + -0.29999998211860657 + 1 + + haze_density + + 2.1150000095367432 + 0 + 0 + 1 + + haze_horizon + + 0.17600001394748688 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.23768773674964905 + -0.97134160995483398 + 0 + + max_y + + 767 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.9016079902648926 + sunlight_color + + 1.9921875 + 1.9921875 + 1.9921875 + 0.6640625 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml b/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml new file mode 100644 index 000000000..64405d95a --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20404692765200849 + 0.24246276689169122 + 0.33000383615406292 + 0.1100123608103587 + + blue_density + + 0.070311017334461212 + 0.070312172174453735 + 0.070313982665538788 + 0.035156991332769394 + + blue_horizon + + 0.23999616268583132 + 0.239999227803052 + 0.24000028550619668 + 1 + + cloud_color + + 0.22615400241566114 + 0.22615400241566114 + 0.22615400241566114 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.88000000953681223 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400354105791 + 10.011000104419489 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00023999999393709004 + 0 + 0 + 1 + + distance_multiplier + + 4.2000002861022949 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000023022 + 0.0010000000214220922 + -0.47999999165507345 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.70710688829421997 + 0.70710664987564087 + 1 + + max_y + + 1534 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999420642852783 + sun_angle + 3.9269909858703613 + sunlight_color + + 0.16206490993499756 + 0.16530600190162659 + 0.30668509006500244 + 0.10222836583852768 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml b/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml new file mode 100644 index 000000000..1fdc5b04c --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.080595135688781738 + 0.095768749713897705 + 0.13034236431121826 + 0.043447453528642654 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0.1181640625 + 0.14753724634647369 + 0.2255859375 + 0.11279296875 + + cloud_color + + 0.1328125 + 0.1328125 + 0.1328125 + 0.1328125 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.88000000953711155 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940035411295 + 10.011000104431371 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 5.999999848427251e-005 + 0 + 0 + 1 + + distance_multiplier + + 75.5 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.34999999403953552 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 1 + 3.0028815672267228e-005 + 1 + + max_y + + 438 + 0 + 0 + 1 + + preset_num + 26 + star_brightness + 2 + sun_angle + 4.7123589515686035 + sunlight_color + + 0.092010498046875 + 0.11404039710760117 + 0.142364501953125 + 0.047454833984375 + + + diff --git a/indra/newview/app_settings/windlight/skies/Realistic.xml b/indra/newview/app_settings/windlight/skies/Realistic.xml new file mode 100644 index 000000000..99a1b4667 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Realistic.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.9140625 + 0.9140625 + 0.9140625 + 0.3046875 + + blue_density + + 1.3854242563247681 + 1.5503612756729126 + 1.8020757436752319 + 0.90103787183761597 + + blue_horizon + + 0.174346923828125 + 0.20045472681522369 + 0.278778076171875 + 0.1393890380859375 + + cloud_color + + 0.236663818359375 + 0.26210832595825195 + 0.278961181640625 + 0.278961181640625 + + cloud_pos_density1 + + 0.32999998331069946 + 0.52999997138977051 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.48999997973442078 + 0.125 + 1 + + cloud_scale + + 0.47999998927116394 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.069999694824219 + 10.01099967956543 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 0.00017999998817685992 + 0 + 0 + 1 + + distance_multiplier + + 3 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.5999994277954102 + 0.0010000000474974513 + -0.49999997019767761 + 1 + + haze_density + + 0.42999997735023499 + 0 + 0 + 1 + + haze_horizon + + 0.68000000715255737 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.91269159317016602 + -0.40864911675453186 + 0 + + max_y + + 1342 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.9917697906494141 + sunlight_color + + 1.210693359375 + 1.2674446105957031 + 1.461181640625 + 0.487060546875 + + + diff --git a/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml b/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml new file mode 100644 index 000000000..574727d37 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.05800000205636024475097656 + fresnelOffset + 0.4299999773502349853515625 + fresnelScale + 0.1400000005960464477539062 + normScale + + 2.2000000476837158203125 + 1.10000002384185791015625 + 0.800000011920928955078125 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.03999999910593032836914062 + scaleBelow + 0.329999983310699462890625 + underWaterFogMod + 0 + waterFogColor + + 0.234375 + 1.00000011920928955078125 + 0.999999940395355224609375 + 1 + + waterFogDensity + 12.9960384368896484375 + wave1Dir + + -0.2000000476837158203125 + -0.2400000095367431640625 + + wave2Dir + + -0.190000057220458984375 + 0 + + + diff --git a/indra/newview/app_settings/windlight/water/Realistic.xml b/indra/newview/app_settings/windlight/water/Realistic.xml new file mode 100644 index 000000000..f821e77a6 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Realistic.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.026000000536441803 + fresnelOffset + 0.38999998569488525 + fresnelScale + 0.059999998658895493 + normScale + + 0 + 0 + 0 + + normalMap + 7c88a167-157c-6b31-34ae-e0041360e54e + scaleAbove + 0 + scaleBelow + 0.17999999225139618 + underWaterFogMod + 0.41999998688697815 + waterFogColor + + 0.0745849609375 + 0.10957146435976028 + 0.1285400390625 + 1 + + waterFogDensity + 19.698312759399414 + wave1Dir + + 0.26999998092651367 + -0.16000008583068848 + + wave2Dir + + 0.48999977111816406 + -0.38000011444091797 + + + diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 1ebe49cf6..815923a3c 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -42,6 +42,7 @@ RenderObjectBump 1 1 RenderLocalLights 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 @@ -86,6 +87,7 @@ RenderObjectBump 1 0 RenderLocalLights 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 1 RenderTransparentWater 1 0 RenderTreeLODFactor 1 0 @@ -117,6 +119,7 @@ RenderObjectBump 1 1 RenderLocalLights 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 +RenderTerrainScale 1 9.0 RenderTerrainLODFactor 1 1.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 @@ -149,6 +152,7 @@ RenderObjectBump 1 1 RenderLocalLights 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 +RenderTerrainScale 1 6.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 @@ -179,6 +183,7 @@ RenderObjectBump 1 1 RenderLocalLights 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 5.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 98381248f..8002ea3e4 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -42,6 +42,7 @@ RenderMaxPartCount 1 8192 RenderObjectBump 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 @@ -83,6 +84,7 @@ RenderMaxPartCount 1 512 RenderObjectBump 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 1 RenderTransparentWater 1 0 RenderTreeLODFactor 1 0 @@ -114,6 +116,7 @@ RenderMaxPartCount 1 2048 RenderObjectBump 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 +RenderTerrainScale 1 9.0 RenderTerrainLODFactor 1 1.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 @@ -144,6 +147,7 @@ RenderLocalLights 1 1 RenderMaxPartCount 1 4096 RenderObjectBump 1 1 RenderReflectionDetail 1 2 +RenderTerrainScale 1 6.0 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 @@ -177,6 +181,7 @@ RenderMaxPartCount 1 8192 RenderObjectBump 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 5.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 @@ -266,6 +271,7 @@ RenderAvatarVP 0 0 RenderObjectBump 0 0 RenderMaxPartCount 1 1024 RenderTerrainDetail 1 0 +RenderTerrainScale 1 12.0 RenderUseImpostors 0 0 RenderVBOEnable 1 0 RenderReflectionDetail 0 0 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index be9ca1f12..55fe571bf 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -42,6 +42,7 @@ RenderMaxPartCount 1 8192 RenderObjectBump 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 @@ -86,6 +87,7 @@ RenderMaxPartCount 1 512 RenderObjectBump 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 +RenderTerrainScale 1 12.0 RenderTerrainLODFactor 1 1 RenderTransparentWater 1 0 RenderTreeLODFactor 1 0 @@ -117,6 +119,7 @@ RenderMaxPartCount 1 2048 RenderObjectBump 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 +RenderTerrainScale 1 9.0 RenderTerrainLODFactor 1 1.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 @@ -149,6 +152,7 @@ RenderMaxPartCount 1 4096 RenderObjectBump 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 +RenderTerrainScale 1 6.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 @@ -181,6 +185,7 @@ RenderMaxPartCount 1 8192 RenderObjectBump 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 +RenderTerrainScale 1 5.0 RenderTerrainLODFactor 1 2.0 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 6440652ef..755e97e1c 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -122,6 +122,13 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue) return true; } +static bool handleTerrainScaleChanged(const LLSD& inputvalue) +{ + LLSD newvalue = 1.f / inputvalue.asReal(); + LLDrawPoolTerrain::sDetailScale = newvalue.asReal(); + return true; +} + bool handleStateMachineMaxTimeChanged(const LLSD& newvalue) { AIStateMachine::updateSettings(); @@ -621,6 +628,7 @@ void settings_setup_listeners() gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2)); gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2)); gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2)); + gSavedSettings.getControl("RenderTerrainScale")->getSignal()->connect(boost::bind(&handleTerrainScaleChanged, _2)); gSavedSettings.getControl("OctreeStaticObjectSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2)); gSavedSettings.getControl("OctreeDistanceFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2)); gSavedSettings.getControl("OctreeMaxNodeCapacity")->getSignal()->connect(boost::bind(&handleRepartition, _2)); diff --git a/install.xml b/install.xml index 9e42136ab..285544e0f 100644 --- a/install.xml +++ b/install.xml @@ -36,6 +36,13 @@ GLOD packages + darwin + + md5sum + ae21b0ea01ebf778bd08dcc0d4f94039 + url + https://github.com/downloads/LightDrake/Public-Libraries/glod-1.0pre4-darwin-20110610.tar.bz2 + linux md5sum @@ -80,9 +87,9 @@ darwin md5sum - 2486db13c5ed9340855da3c1c48772af + a2794fbeeb03f530a6b7a0879c544f32 url - https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-darwin-20120618.tar.bz2 linux @@ -120,9 +127,9 @@ darwin md5sum - ad736bc1558c37ca6648bc7e72047faa + e4c0aa075086ec2f6b62c9498b381d63 url - https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.1-darwin-20110217.tar.bz2 linux @@ -160,9 +167,9 @@ darwin md5sum - 2cad51575b429be4fdadb5d63da1c739 + e859007376f28d699bfea420e44d02e3 url - https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/boost-1.45.0-darwin-20110304.tar.bz2 linux @@ -190,6 +197,13 @@ scea packages + darwin + + md5sum + d1af5f9ae7740566a184b9af40af36da + url + https://github.com/downloads/LightDrake/Public-Libraries/colladadom-2.2-darwin-20110420.tar.bz2 + linux md5sum @@ -219,9 +233,9 @@ darwin md5sum - 525f6b18ea5af8fbd691c2ac1769056c + 3f2763221bd366242865414112678570 url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/curl-7.21.1-darwin-20110316.tar.bz2 linux @@ -345,9 +359,9 @@ darwin md5sum - c457a0a041ac4946265889a503d26c3d + 4dc2d4b3890b981f284f5da8f810dc93 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/expat-2.0.1-darwin-20110218.tar.bz2 linux @@ -419,9 +433,9 @@ darwin md5sum - 2849e9dd6f26294371a27197972fd1cf + 8acd5ccfa8134833a98401b11394930d url - https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-darwin-20111010.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.4.4-darwin-20110307.tar.bz2 linux @@ -505,9 +519,9 @@ darwin md5sum - 84f792a860691d0fad6d1de6eeb31baa + f7aa89ac04607d52b11d5ca46b5e75e6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20090623a.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/glui-2.36-darwin-20110309.tar.bz2 windows @@ -598,9 +612,9 @@ darwin md5sum - 9b970abfc9df40ad6d183a4b1f732fb2 + 6d103995df9f1e97d06ecc20704c30f6 url - http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz + https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-darwin-20120616.tar.bz2 linux @@ -638,9 +652,9 @@ darwin md5sum - 8d38d74c481e9aab4518c8f2a7d52800 + ebad9348d0cbf1d768de727c1d6e1822 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-darwin-20110228.tar.bz2 linux @@ -678,9 +692,9 @@ darwin md5sum - 4c6b949778099a63550898f00f3e6a5e + 70e7a004114983a68d701a83c5d4315c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20090923.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/jsoncpp-0.5.0-darwin-20110131.tar.bz2 linux @@ -718,9 +732,9 @@ darwin md5sum - 82659b48831cbf58bf04b86602939e0b + 80506ac813e36a51a5beadf3d08b2b81 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20090304.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libpng-1.5.1-darwin-20110222.tar.bz2 linux @@ -795,9 +809,9 @@ darwin md5sum - c983326e0fbe1b77ffc9e006a4c9bee2 + 9bedf2f283e899652a5e7ac6ea3d6a08 url - https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-darwin-20110317.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-4.7.1-darwin-20120228.tar.bz2 linux @@ -854,9 +868,9 @@ darwin md5sum - 17999c47e17f2dd9e12a22372ce8ff14 + 0cd7114c04ba7ac0a824f9f4cead4b39 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libndofdev-0.1-darwin-20110308.tar.bz2 linux @@ -894,9 +908,9 @@ darwin md5sum - 5a154313bc30eacd8cfa1acd852ecd3e + 600c6e3776f9c91068aef43c76eca501 url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/ogg_vorbis-1.2.2-1.3.2-darwin-20110510.tar.bz2 linux @@ -930,9 +944,9 @@ darwin md5sum - a7b49e0f3eedbd5de117a3524c414b3a + 095e8a20cd0c74e2121ca81fdf389d25 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-darwin-20120207.tar.bz2 linux @@ -1000,6 +1014,13 @@ bsd packages + darwin + + md5sum + fca72d132adfe24a7a057ad21b9915eb + url + https://github.com/downloads/LightDrake/Public-Libraries/pcre-7.6-darwin-20110504.tar.bz2 + linux md5sum @@ -1047,25 +1068,6 @@ - unistd - - copyright - (c) 2008 Linden Lab. - description - Placeholder file to make flex happy on windows. - license - linden - packages - - windows - - md5sum - 6353aff33d7d03b22055aec76f53a866 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/unistd-windows-20080611.tar.bz2 - - - vivox copyright @@ -1117,9 +1119,9 @@ darwin md5sum - 2d3a918c88d756422c1a8139ebe15f56 + 0d99f62811a2ae181ccb56536134ba7c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/xmlrpc_epi-0.54.1-darwin-20110307.tar.bz2 linux @@ -1157,9 +1159,9 @@ darwin md5sum - 58ef62004b508b234039f6a313d852eb + 7daee7ada1bcc90fa367775f04e9950a url - https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/zlib-1.2.5-darwin-20110211.tar.bz2 linux diff --git a/scripts/repackage.sh b/scripts/repackage.sh index ee07ecd95..9018a7cb7 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -29,7 +29,7 @@ case "$1" in ;; --mac|--osx|--darwin|-x|mac|osx|darwin) MODE=osx - LIBPATH="libraries/universal-darwin/lib_release" + LIBPATH="libraries/universal-darwin/lib/release" LIBDPATH="libraries/universal-darwin/lib/debug" INCPATH="libraries/universal-darwin/include" ;;