diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 462d6e989..2450d2a35 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -64,6 +64,7 @@ include_directories( ) set(viewer_SOURCE_FILES + ascentdaycyclemanager.cpp ascentfloatercontactgroups.cpp ascentprefssys.cpp ascentprefsvan.cpp @@ -513,6 +514,7 @@ endif (LINUX) set(viewer_HEADER_FILES CMakeLists.txt ViewerInstall.cmake + ascentdaycyclemanager.h ascentfloatercontactgroups.h ascentprefssys.h ascentprefsvan.h diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 789d74009..8f380563d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -867,6 +867,17 @@ Value Custom + AscentActiveDayCycle + + Comment + Day cycle currently in use + Persist + 1 + Type + String + Value + Default + AscentAutoCloseOOC Comment diff --git a/indra/newview/app_settings/windlight/days/Default.xml b/indra/newview/app_settings/windlight/days/Default.xml index d3d7ece7e..3d3afd507 100644 --- a/indra/newview/app_settings/windlight/days/Default.xml +++ b/indra/newview/app_settings/windlight/days/Default.xml @@ -1,36 +1,36 @@ - - - - 0 - A-12AM - - - 0.125 - A-3AM - - - 0.25 - A-6AM - - - 0.375 - A-9AM - - - 0.5 - A-12PM - - - 0.625 - A-3PM - - - 0.75 - A-6PM - - - 0.875 - A-9PM - - - + + + + 0 + A-12AM + + + 0.125 + A-3AM + + + 0.25 + A-6AM + + + 0.375 + A-9AM + + + 0.5 + A-12PM + + + 0.625 + A-3PM + + + 0.75 + A-6PM + + + 0.875 + A-9PM + + + diff --git a/indra/newview/app_settings/windlight/days/Happy%20Bivouac.xml b/indra/newview/app_settings/windlight/days/Happy%20Bivouac.xml new file mode 100644 index 000000000..2fa7178d3 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/Happy%20Bivouac.xml @@ -0,0 +1,44 @@ + + + + 0 + E-12am + + + 0.125 + E-3am + + + 0.1666666716337204 + E-4am + + + 0.25 + E-6am + + + 0.375 + E-9am + + + 0.5 + E-12pm + + + 0.625 + E-3pm + + + 0.75 + E-6pm + + + 0.79166668653488159 + E-7pm + + + 0.875 + E-9pm + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D12am.xml b/indra/newview/app_settings/windlight/skies/E%2D12am.xml new file mode 100644 index 000000000..8fcf8bf5b --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D12am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.17999999225139618 + 0.26999998092651367 + 0.32999998331069946 + 0.32999998331069946 + + blue_density + + 0.56341457366943359 + 0.65999996662139893 + 0.5473170280456543 + 0.32999998331069946 + + blue_horizon + + 0.099999994039535522 + 0.14000000059604645 + 0.15999999642372131 + 0.15999999642372131 + + cloud_color + + 0.22615399956703186 + 0.31999999284744263 + 0.34000000357627869 + 0.34000000357627869 + + 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.069999694824219 + 10.01099967956543 + + cloud_shadow + + 0.11999999731779099 + 0 + 0 + 1 + + density_multiplier + + 7.9999997979030013e-005 + 0 + 0 + 1 + + distance_multiplier + + 27 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0099999904632568 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.7999999523162842 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.99992102384567261 + -0.012566247954964638 + 1 + + max_y + + 906.19991350494092 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999994039535522 + sun_angle + 4.7249555587768555 + sunlight_color + + 0.14999999105930328 + 0.21000000834465027 + 0.26999998092651367 + 0.26999998092651367 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D12pm.xml b/indra/newview/app_settings/windlight/skies/E%2D12pm.xml new file mode 100644 index 000000000..eb41debe9 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D12pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0799999237060547 + 1.0660644769668579 + 0.89999997615814209 + 0.35999998450279236 + + blue_density + + 0.2800000011920929 + 0.39393550157546997 + 0.47999998927116394 + 0.47999998927116394 + + blue_horizon + + 0.41999998688697815 + 0.62000000476837158 + 1.0399999618530273 + 1.0399999618530273 + + cloud_color + + 0.31000000238418579 + 0.31000000238418579 + 0.31000000238418579 + 0.31000000238418579 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.69569224119186401 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.26999998092651367 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.139999389648437 + 10.01099967956543 + + cloud_shadow + + 0.11999999731779099 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 7.4000000953674316 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 12.600000381469727 + 0.0010000000474974513 + -0.64999997615814209 + 1 + + haze_density + + 1.9099999666213989 + 0 + 0 + 1 + + haze_horizon + + 0.25999999046325684 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.99950653314590454 + -0.031410936266183853 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0 + sun_angle + 1.6022124290466309 + sunlight_color + + 0.77586203813552856 + 0.89999997615814209 + 0.84000003337860107 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D3am.xml b/indra/newview/app_settings/windlight/skies/E%2D3am.xml new file mode 100644 index 000000000..f05c4306f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D3am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.17999999225139618 + 0.26999998092651367 + 0.32999998331069946 + 0.32999998331069946 + + blue_density + + 0.56000000238418579 + 0.65999996662139893 + 0.53999996185302734 + 0.65999996662139893 + + blue_horizon + + 0.099999994039535522 + 0.14000000059604645 + 0.15999999642372131 + 0.15999999642372131 + + cloud_color + + 0.22615399956703186 + 0.31999999284744263 + 0.34000000357627869 + 0.34000000357627869 + + 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.069999694824219 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00026000000070780516 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0099999904632568 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.4599999189376831 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.84767758846282959 + -0.53051173686981201 + 1 + + max_y + + 1074 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999994039535522 + sun_angle + 5.2715930938720703 + sunlight_color + + 0.14999999105930328 + 0.21000000834465027 + 0.26999998092651367 + 0.26999998092651367 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D3pm.xml b/indra/newview/app_settings/windlight/skies/E%2D3pm.xml new file mode 100644 index 000000000..d6e408c05 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D3pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.2571429014205933 + 1.3199999332427979 + 1.0057142972946167 + 0.43999999761581421 + + blue_density + + 0.20495410263538361 + 0.56451046466827393 + 0.69999998807907104 + 0.34999999403953552 + + blue_horizon + + 0.39999997615814209 + 0.6721307635307312 + 1 + 0.5 + + 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.139999389648437 + 10.01099967956543 + + cloud_shadow + + 0.08999999612569809 + 0 + 0 + 1 + + density_multiplier + + 0.00016999999934341758 + 0 + 0 + 1 + + distance_multiplier + + 5.3000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.91999995708465576 + 0 + 0 + 1 + + glow + + 10.799999237060547 + 0.0010000000474974513 + -0.64999997615814209 + 1 + + haze_density + + 1.9099999666213989 + 0 + 0 + 1 + + haze_horizon + + 0.25999999046325684 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.85099434852600098 + -0.52517479658126831 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0 + sun_angle + 2.1237168312072754 + sunlight_color + + 0.66705864667892456 + 0.80999994277954102 + 0.64323520660400391 + 0.26999998092651367 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D4am.xml b/indra/newview/app_settings/windlight/skies/E%2D4am.xml new file mode 100644 index 000000000..30935d114 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D4am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.17999999225139618 + 0.26999998092651367 + 0.32999998331069946 + 0.32999998331069946 + + blue_density + + 0.58048778772354126 + 0.68000000715255737 + 0.56390243768692017 + 0.34000000357627869 + + blue_horizon + + 0.099999994039535522 + 0.14000000059604645 + 0.15999999642372131 + 0.15999999642372131 + + cloud_color + + 0.22615399956703186 + 0.31999999284744263 + 0.34000000357627869 + 0.34000000357627869 + + 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.069999694824219 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00026000000070780516 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0099999904632568 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.4599999189376831 + 0 + 0 + 1 + + haze_horizon + + 0.22999998927116394 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.65658539533615112 + -0.75425165891647339 + 1 + + max_y + + 1074 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999994039535522 + sun_angle + 5.5669026374816895 + sunlight_color + + 0.14999999105930328 + 0.23999999463558197 + 0.26999998092651367 + 0.26999998092651367 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D6am.xml b/indra/newview/app_settings/windlight/skies/E%2D6am.xml new file mode 100644 index 000000000..c73bae805 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D6am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.95999997854232788 + 0.74666666984558105 + 0.39111104607582092 + 0.31999999284744263 + + blue_density + + 0.35999998450279236 + 0.49999505281448364 + 1 + 1 + + blue_horizon + + 0 + 0.60923081636428833 + 0.89999997615814209 + 0.44999998807907104 + + cloud_color + + 0.41999998688697815 + 0.41999998688697815 + 0.41999998688697815 + 0.41999998688697815 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.69569224119186401 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.139999389648437 + 10.01099967956543 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 19.100000381469727 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.81000000238418579 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -1.5999999046325684 + 1 + + haze_density + + 2.3199999332427979 + 0 + 0 + 1 + + haze_horizon + + 0.38999998569488525 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.12533323466777802 + 0.99211472272872925 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0.2199999988079071 + sun_angle + 0.12566371262073517 + sunlight_color + + 1.8300000429153442 + 1.0707448720932007 + 0.61773747205734253 + 0.61000001430511475 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D6pm.xml b/indra/newview/app_settings/windlight/skies/E%2D6pm.xml new file mode 100644 index 000000000..8d1dc5934 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D6pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.65999996662139893 + 0.65999996662139893 + 0.50999999046325684 + 0.2199999988079071 + + blue_density + + 0.18153078854084015 + 0.49999505281448364 + 0.65999996662139893 + 0.65999996662139893 + + blue_horizon + + 0.43070217967033386 + 0.85394656658172607 + 1.0399999618530273 + 1.0399999618530273 + + cloud_color + + 0.34000000357627869 + 0.34000000357627869 + 0.34000000357627869 + 0.34000000357627869 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.69569224119186401 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.26999998092651367 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.139999389648437 + 10 + + cloud_shadow + + 0.10999999940395355 + 0 + 0 + 1 + + density_multiplier + + 0.00016999999934341758 + 0 + 0 + 1 + + distance_multiplier + + 5.3000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0499999523162842 + 0 + 0 + 1 + + glow + + 11.19999885559082 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 1.8499999046325684 + 0 + 0 + 1 + + haze_horizon + + 0.35999998450279236 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.70264989137649536 + -0.7115357518196106 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0.08999999612569809 + sun_angle + 2.3624777793884277 + sunlight_color + + 0.84000003337860107 + 0.87000000476837158 + 0.80999994277954102 + 0.87000000476837158 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D7pm.xml b/indra/newview/app_settings/windlight/skies/E%2D7pm.xml new file mode 100644 index 000000000..bdd67db63 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D7pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.53999996185302734 + 0.36947363615036011 + 0.22736841440200806 + 0.17999999225139618 + + blue_density + + 0.22608692944049835 + 0.59193676710128784 + 1.0399999618530273 + 0.51999998092651367 + + blue_horizon + + 0.63999998569488525 + 1.1399999856948853 + 1.2799999713897705 + 0.63999998569488525 + + cloud_color + + 0.31000000238418579 + 0.31000000238418579 + 0.31000000238418579 + 0.31000000238418579 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.69569224119186401 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.23444875962174549 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.139999389648437 + 10.002444075434141 + + cloud_shadow + + 0.10999999940395355 + 0 + 0 + 1 + + density_multiplier + + 0.00019999999494757503 + 0 + 0 + 1 + + distance_multiplier + + 5.3000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0799999237060547 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -1.4499999284744263 + 1 + + haze_density + + 1.8399999141693115 + 0 + 0 + 1 + + haze_horizon + + 0.55000001192092896 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.2729516327381134 + -0.96202772855758667 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0.17000000178813934 + sun_angle + 2.8651328086853027 + sunlight_color + + 1.1100000143051147 + 0.7580488920211792 + 0.54146337509155273 + 0.37000000476837158 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D9am.xml b/indra/newview/app_settings/windlight/skies/E%2D9am.xml new file mode 100644 index 000000000..76b3301d7 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D9am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.44785711169242859 + 0.56999999284744263 + 0.44785711169242859 + 0.18999999761581421 + + blue_density + + 0.2800000011920929 + 0.37999999523162842 + 0.53999996185302734 + 0.53999996185302734 + + blue_horizon + + 0.35999998450279236 + 0.85394656658172607 + 1.1000000238418579 + 1.1000000238418579 + + 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.26999998092651367 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.139999389648437 + 10.01099967956543 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00019999999494757503 + 0 + 0 + 1 + + distance_multiplier + + 8.6000003814697266 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.81000000238418579 + 0 + 0 + 1 + + glow + + 14.800000190734863 + 0.0010000000474974513 + -0.34999999403953552 + 1 + + haze_density + + 1.9099999666213989 + 0 + 0 + 1 + + haze_horizon + + 0.49740666151046753 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.80156701803207397 + 0.59790498018264771 + 0 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0 + sun_angle + 0.92991143465042114 + sunlight_color + + 0.84000003337860107 + 0.77538466453552246 + 0.68999993801116943 + 0.2800000011920929 + + + diff --git a/indra/newview/app_settings/windlight/skies/E%2D9pm.xml b/indra/newview/app_settings/windlight/skies/E%2D9pm.xml new file mode 100644 index 000000000..d5cb7c5cf --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/E%2D9pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.21000000834465027 + 0.29999998211860657 + 0.32999998331069946 + 0.32999998331069946 + + blue_density + + 0.25999999046325684 + 0.53999996185302734 + 0.65999996662139893 + 0.65999996662139893 + + blue_horizon + + 0.11000000685453415 + 0.13999997079372406 + 0.15999999642372131 + 0.079999998211860657 + + cloud_color + + 0.25 + 0.25 + 0.25 + 0.25 + + 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.139999389648437 + 10.01099967956543 + + cloud_shadow + + 0.11999999731779099 + 0 + 0 + 1 + + density_multiplier + + 0.00016999999934341758 + 0 + 0 + 1 + + distance_multiplier + + 5.3000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.87999999523162842 + 0 + 0 + 1 + + glow + + 11.600000381469727 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 1.75 + 0 + 0 + 1 + + haze_horizon + + 0.34000000357627869 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.7862887978553772 + 0.6178591251373291 + 1 + + max_y + + 600 + 0 + 0 + 1 + + preset_num + 10 + star_brightness + 0.35999998450279236 + sun_angle + 4.0463719367980957 + sunlight_color + + 0.14538462460041046 + 0.20769229531288147 + 0.26999998092651367 + 0.08999999612569809 + + + diff --git a/indra/newview/ascentdaycyclemanager.cpp b/indra/newview/ascentdaycyclemanager.cpp new file mode 100644 index 000000000..b83168f64 --- /dev/null +++ b/indra/newview/ascentdaycyclemanager.cpp @@ -0,0 +1,378 @@ +/** + * @file ascentdaycyclemanager.cpp + * @Author Duncan Garrett + * Manager for Windlight Daycycles so we can actually save more than one + * + * Created August 27 2010 + * + * ALL SOURCE CODE IS PROVIDED "AS IS." THE CREATOR MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * k ilu bye + */ + +#include "llviewerprecompiledheaders.h" + +#include "ascentdaycyclemanager.h" + +#include "pipeline.h" +#include "llsky.h" + +#include "llsliderctrl.h" +#include "llspinctrl.h" +#include "llcheckboxctrl.h" +#include "lluictrlfactory.h" +#include "llviewercamera.h" +#include "llcombobox.h" +#include "lllineeditor.h" +#include "llsdserialize.h" + +#include "v4math.h" +#include "llviewerdisplay.h" +#include "llviewercontrol.h" +#include "llviewerwindow.h" +#include "lldrawpoolwater.h" +#include "llagent.h" +#include "llviewerregion.h" + +#include "llwldaycycle.h" +#include "llfloaterwindlight.h" +#include "llfloaterdaycycle.h" +#include "llfloaterenvsettings.h" + +#include "curl/curl.h" + +AscentDayCycleManager * AscentDayCycleManager::sInstance = NULL; + +AscentDayCycleManager::AscentDayCycleManager() +{ +} + +AscentDayCycleManager::~AscentDayCycleManager() +{ +} + +void AscentDayCycleManager::loadPresets(const std::string& file_name) +{ + std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", "")); + LL_INFOS2("AppInit", "Shaders") << "Loading Default Day Cycle preset from " << path_name << LL_ENDL; + + bool found = true; + while(found) + { + std::string name; + found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false); + if(found) + { + + name=name.erase(name.length()-4); + + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_unescape(name.c_str(), name.size()); + std::string unescaped_name(curl_str); + curl_free(curl_str); + curl_str = NULL; + + LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL; + loadPreset(unescaped_name,FALSE); + } + } + + // And repeat for user presets, note the user presets will modify any system presets already loaded + + std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", "")); + LL_INFOS2("AppInit", "Shaders") << "Loading User Daycycle preset from " << path_name2 << LL_ENDL; + + found = true; + while(found) + { + std::string name; + found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false); + if(found) + { + name=name.erase(name.length()-4); + + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_unescape(name.c_str(), name.size()); + std::string unescaped_name(curl_str); + curl_free(curl_str); + curl_str = NULL; + + LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL; + loadPreset(unescaped_name,FALSE); + } + } + +} + +void AscentDayCycleManager::savePresets(const std::string & fileName) +{ + //Nobody currently calls me, but if they did, then its reasonable to write the data out to the user's folder + //and not over the RO system wide version. + + LLSD paramsData(LLSD::emptyMap()); + + std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", fileName)); + + /*for(std::map::iterator mIt = mParamList.begin(); + mIt != mParamList.end(); + ++mIt) + { + paramsData[mIt->first] = mIt->second.getAll(); + }*/ + + llofstream presetsXML(pathName); + + LLPointer formatter = new LLSDXMLFormatter(); + + formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY); + + presetsXML.close(); +} + +void AscentDayCycleManager::loadPreset(const std::string & name,bool propagate) +{ + + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_escape(name.c_str(), name.size()); + std::string escaped_filename(curl_str); + curl_free(curl_str); + curl_str = NULL; + + escaped_filename += ".xml"; + + std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", escaped_filename)); + llinfos << "Loading Day Cycle preset from " << pathName << llendl; + + llifstream presetsXML; + presetsXML.open(pathName.c_str()); + + // That failed, try loading from the users area instead. + if(!presetsXML) + { + pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", escaped_filename); + llinfos << "Loading User Day Cycle preset from " << pathName << llendl; + presetsXML.open(pathName.c_str()); + } + + if (presetsXML) + { + LLSD paramsData(LLSD::emptyMap()); + + LLPointer parser = new LLSDXMLParser(); + + parser->parse(presetsXML, paramsData, LLSDSerialize::SIZE_UNLIMITED); + + std::map::iterator mIt = mParamList.find(name); + if(mIt == mParamList.end()) + { + addParamSet(name, paramsData); + } + else + { + setParamSet(name, paramsData); + } + presetsXML.close(); + } + else + { + llwarns << "Can't find " << name << llendl; + return; + } + + +} + +void AscentDayCycleManager::savePreset(const std::string & name) +{ + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_escape(name.c_str(), name.size()); + std::string escaped_filename(curl_str); + curl_free(curl_str); + curl_str = NULL; + + escaped_filename += ".xml"; + + // make an empty llsd + LLSD paramsData(LLSD::emptyMap()); + std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", escaped_filename)); + + // fill it with LLSD windlight params + //paramsData = mParamList[name].getAll(); + + // write to file + llofstream presetsXML(pathName); + LLPointer formatter = new LLSDXMLFormatter(); + formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY); + presetsXML.close(); +} + +void AscentDayCycleManager::update(LLViewerCamera * cam) +{ + LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM); + + // sync menus if they exist + if(LLFloaterWindLight::isOpen()) + { + LLFloaterWindLight::instance()->syncMenu(); + } + if(LLFloaterDayCycle::isOpen()) + { + LLFloaterDayCycle::instance()->syncMenu(); + } + if(LLFloaterEnvSettings::isOpen()) + { + LLFloaterEnvSettings::instance()->syncMenu(); + } + + stop_glerror(); +} + +// static +void AscentDayCycleManager::initClass(void) +{ + instance(); +} + +// static +void AscentDayCycleManager::cleanupClass() +{ + delete sInstance; + sInstance = NULL; +} + +void AscentDayCycleManager::resetAnimator(F32 curTime, bool run) +{ + mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate, + curTime, run); + + return; +} +bool AscentDayCycleManager::addParamSet(const std::string& name, LLWLDayCycle& param) +{ + // add a new one if not one there already + std::map::iterator mIt = mParamList.find(name); + if(mIt == mParamList.end()) + { + mParamList[name] = param; + return true; + } + + return false; +} + +BOOL AscentDayCycleManager::addParamSet(const std::string& name, LLSD const & param) +{ + // add a new one if not one there already + std::map::const_iterator finder = mParamList.find(name); + if(finder == mParamList.end()) + { + mParamList[name].mName = name; + return TRUE; + } + else + { + return FALSE; + } +} + +bool AscentDayCycleManager::getParamSet(const std::string& name, LLWLDayCycle& param) +{ + // find it and set it + std::map::iterator mIt = mParamList.find(name); + if(mIt != mParamList.end()) + { + param = mParamList[name]; + param.mName = name; + return true; + } + + return false; +} + +bool AscentDayCycleManager::setParamSet(const std::string& name, LLWLDayCycle& param) +{ + mParamList[name] = param; + + return true; +} + +bool AscentDayCycleManager::setParamSet(const std::string& name, const LLSD & param) +{ + // quick, non robust (we won't be working with files, but assets) check + if(!param.isMap()) + { + return false; + } + + return true; +} + +bool AscentDayCycleManager::removeParamSet(const std::string& name, bool delete_from_disk) +{ + // remove from param list + std::map::iterator mIt = mParamList.find(name); + if(mIt != mParamList.end()) + { + mParamList.erase(mIt); + } + + F32 key; + + // remove all references + bool stat = true; + do + { + // get it + stat = mDay.getKey(name, key); + if(stat == false) + { + break; + } + + // and remove + stat = mDay.removeKey(key); + + } while(stat == true); + + if(delete_from_disk) + { + std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", "")); + + // use full curl escaped name + char * curl_str = curl_escape(name.c_str(), name.size()); + std::string escaped_name(curl_str); + curl_free(curl_str); + curl_str = NULL; + + gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml"); + } + + return true; +} + + +// static +AscentDayCycleManager * AscentDayCycleManager::instance() +{ + if(NULL == sInstance) + { + sInstance = new AscentDayCycleManager(); + + sInstance->loadPresets(LLStringUtil::null); + + // load the day + sInstance->mDay.loadDayCycle(gSavedSettings.getString("AscentActiveDayCycle")); + + // *HACK - sets cloud scrolling to what we want... fix this better in the future + sInstance->getParamSet("Default", sInstance->mCurParams); + + // set it to noon + sInstance->resetAnimator(0.5, true); + + // but use linden time sets it to what the estate is + sInstance->mAnimator.mUseLindenTime = true; + } + + return sInstance; +} diff --git a/indra/newview/ascentdaycyclemanager.h b/indra/newview/ascentdaycyclemanager.h new file mode 100644 index 000000000..6c84901c9 --- /dev/null +++ b/indra/newview/ascentdaycyclemanager.h @@ -0,0 +1,109 @@ +/** + * @file ascentdaycyclemanager.h + * @Author Duncan Garrett + * Manager for Windlight Daycycles so we can actually save more than one + * + * Created October 04 2010 + * + * ALL SOURCE CODE IS PROVIDED "AS IS." THE CREATOR MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * k ilu bye + */ + +#ifndef ASCENT_DAYCYCLEMANAGER_H +#define ASCENT_DAYCYCLEMANAGER_H + +#include +#include +#include "llwldaycycle.h" +#include "llwlanimator.h" +#include "llwldaycycle.h" +#include "llviewercamera.h" + +/// WindLight parameter manager class - what controls all the wind light shaders +class AscentDayCycleManager +{ +public: + + AscentDayCycleManager(); + ~AscentDayCycleManager(); + + /// load a preset file + void loadPresets(const std::string & fileName); + + /// save the preset file + void savePresets(const std::string & fileName); + + /// load an individual preset into the sky + void loadPreset(const std::string & name,bool propogate=true); + + /// save the parameter presets to file + void savePreset(const std::string & name); + + /// Set shader uniforms dirty, so they'll update automatically. + void propagateParameters(void); + + /// Update shader uniforms that have changed. + void updateShaderUniforms(LLGLSLShader * shader); + + /// setup the animator to run + void resetAnimator(F32 curTime, bool run); + + /// update information camera dependent parameters + void update(LLViewerCamera * cam); + + + /// Perform global initialization for this class. + static void initClass(void); + + // Cleanup of global data that's only inited once per class. + static void cleanupClass(); + + /// add a param to the list + bool addParamSet(const std::string& name, LLWLDayCycle& param); + + /// add a param to the list + BOOL addParamSet(const std::string& name, LLSD const & param); + + /// get a param from the list + bool getParamSet(const std::string& name, LLWLDayCycle& param); + + /// set the param in the list with a new param + bool setParamSet(const std::string& name, LLWLDayCycle& param); + + /// set the param in the list with a new param + bool setParamSet(const std::string& name, LLSD const & param); + + /// gets rid of a parameter and any references to it + /// returns true if successful + bool removeParamSet(const std::string& name, bool delete_from_disk); + + // singleton pattern implementation + static AscentDayCycleManager * instance(); + +public: + + // helper variables + LLWLAnimator mAnimator; + + + // list of params and how they're cycled for days + LLWLDayCycle mDay; + + LLWLDayCycle mCurParams; + + /// Sun Delta Terrain tweak variables. + F32 mSunDeltaYaw; + + // list of all the day cycles, listed by name + std::map mParamList; + + +private: + // our parameter manager singleton instance + static AscentDayCycleManager * sInstance; + +}; + +#endif diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 58876a8de..07106e6b1 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -37,6 +37,7 @@ #include "pipeline.h" #include "llsky.h" +#include "llboost.h" #include "llsliderctrl.h" #include "llmultislider.h" #include "llmultisliderctrl.h" @@ -54,12 +55,16 @@ #include "llviewerwindow.h" #include "llwlparamset.h" +#include "llwldaycycle.h" #include "llwlparammanager.h" +#include "ascentdaycyclemanager.h" //Ascent Addition #include "llpostprocess.h" #include "llfloaterwindlight.h" LLFloaterDayCycle* LLFloaterDayCycle::sDayCycle = NULL; + +std::set LLFloaterDayCycle::sDefaultPresets; std::map LLFloaterDayCycle::sSliderToKey; const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f; @@ -88,6 +93,37 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floate sldr->addSlider(); + // add the combo boxes + LLComboBox* comboBox = getChild("DayCyclePresetsCombo"); + + if(comboBox != NULL) { + + std::map::iterator mIt = + AscentDayCycleManager::instance()->mParamList.begin(); + for(; mIt != AscentDayCycleManager::instance()->mParamList.end(); mIt++) + { + comboBox->add(mIt->first); + } + + // entry for when we're in estate time + comboBox->add(LLStringUtil::null); + + // set defaults on combo boxes + comboBox->selectByValue(LLSD("Default")); + } + + // add the list of presets + std::string def_days = getString("DaycycleDefaultNames"); + + // no editing or deleting of the blank string + sDefaultPresets.insert(""); + boost_tokenizer tokens(def_days, boost::char_separator(":")); + for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter) + { + std::string tok(*token_iter); + //sDefaultPresets.insert(tok); + } + // load it up initCallbacks(); } @@ -130,6 +166,15 @@ void LLFloaterDayCycle::initCallbacks(void) childSetAction("WLLoadDayCycle", onLoadDayCycle, NULL); childSetAction("WLSaveDayCycle", onSaveDayCycle, NULL); + LLComboBox* comboBox = getChild("DayCyclePresetsCombo"); + + //childSetAction("WLLoadPreset", onLoadPreset, comboBox); + childSetAction("DayCycleNewPreset", onNewPreset, comboBox); + childSetAction("DayCycleSavePreset", onSavePreset, comboBox); + childSetAction("DayCycleDeletePreset", onDeletePreset, comboBox); + + comboBox->setCommitCallback(onChangePresetName); + childSetAction("WLAddKey", onAddKey, NULL); childSetAction("WLDeleteKey", onDeleteKey, NULL); } @@ -268,6 +313,216 @@ void LLFloaterDayCycle::onClose(bool app_quitting) } } +void LLFloaterDayCycle::onNewPreset(void* userData) +{ + LLNotifications::instance().add("NewDaycyclePreset", LLSD(), LLSD(), newPromptCallback); +} + +void LLFloaterDayCycle::onSavePreset(void* userData) +{ + // get the name + LLComboBox* comboBox = sDayCycle->getChild( + "DayCyclePresetsCombo"); + + // don't save the empty name + if(comboBox->getSelectedItemLabel() == "") + { + return; + } + + // check to see if it's a default and shouldn't be overwritten + std::set::iterator sIt = sDefaultPresets.find( + comboBox->getSelectedItemLabel()); + if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("SkyEditPresets")) + { + LLNotifications::instance().add("WLNoEditDefault"); + return; + } + + LLWLParamManager::instance()->mCurParams.mName = + comboBox->getSelectedItemLabel(); + + LLNotifications::instance().add("WLSavePresetAlert", LLSD(), LLSD(), saveAlertCallback); +} + +bool LLFloaterDayCycle::saveAlertCallback(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotification::getSelectedOption(notification, response); + // if they choose save, do it. Otherwise, don't do anything + if(option == 0) + { + LLComboBox* combo_box = sDayCycle->getChild("DayCyclePresetsCombo"); + // comment this back in to save to file + LLWLParamManager::instance()->mDay.saveDayCycle(combo_box->getSelectedValue().asString()); + } + return false; +} + +void LLFloaterDayCycle::onDeletePreset(void* userData) +{ + LLComboBox* combo_box = sDayCycle->getChild( + "DayCyclePresetsCombo"); + + if(combo_box->getSelectedValue().asString() == "") + { + return; + } + + LLSD args; + args["SKY"] = combo_box->getSelectedValue().asString(); + LLNotifications::instance().add("WLDeletePresetAlert", args, LLSD(), + boost::bind(&LLFloaterDayCycle::deleteAlertCallback, sDayCycle, _1, _2)); +} + +bool LLFloaterDayCycle::deleteAlertCallback(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotification::getSelectedOption(notification, response); + + // if they choose delete, do it. Otherwise, don't do anything + if(option == 0) + { + LLComboBox* combo_box = getChild( + "DayCyclePresetsCombo"); + LLFloaterDayCycle* day_cycle = NULL; + LLComboBox* key_combo = NULL; + LLMultiSliderCtrl* mult_sldr = NULL; + + if(LLFloaterDayCycle::isOpen()) + { + day_cycle = LLFloaterDayCycle::instance(); + key_combo = day_cycle->getChild( + "WLKeyPresets"); + mult_sldr = day_cycle->getChild("WLDayCycleKeys"); + } + + std::string name(combo_box->getSelectedValue().asString()); + + // check to see if it's a default and shouldn't be deleted + std::set::iterator sIt = sDefaultPresets.find(name); + if(sIt != sDefaultPresets.end()) + { + LLNotifications::instance().add("WLNoEditDefault"); + return false; + } + + AscentDayCycleManager::instance()->removeParamSet(name, true); + + // remove and choose another + S32 new_index = combo_box->getCurrentIndex(); + + combo_box->remove(name); + if(key_combo != NULL) + { + key_combo->remove(name); + + // remove from slider, as well + day_cycle->deletePreset(name); + } + + // pick the previously selected index after delete + if(new_index > 0) + { + new_index--; + } + + if(combo_box->getItemCount() > 0) + { + combo_box->setCurrentByIndex(new_index); + } + } + return false; +} + +bool LLFloaterDayCycle::newPromptCallback(const LLSD& notification, const LLSD& response) +{ + std::string text = response["message"].asString(); + S32 option = LLNotification::getSelectedOption(notification, response); + + if(text == "") + { + return false; + } + + if(option == 0) { + LLComboBox* comboBox = sDayCycle->getChild( + "DayCyclePresetsCombo"); + + LLFloaterDayCycle* sDayCycle = NULL; + LLComboBox* keyCombo = NULL; + if(LLFloaterDayCycle::isOpen()) + { + sDayCycle = LLFloaterDayCycle::instance(); + keyCombo = sDayCycle->getChild( + "WLKeyPresets"); + } + + // add the current parameters to the list + // see if it's there first + std::map::iterator mIt = + AscentDayCycleManager::instance()->mParamList.find(text); + + // if not there, add a new one + if(mIt == AscentDayCycleManager::instance()->mParamList.end()) + { + AscentDayCycleManager::instance()->addParamSet(text, + AscentDayCycleManager::instance()->mCurParams); + comboBox->add(text); + comboBox->sortByName(); + + // add a blank to the bottom + comboBox->selectFirstItem(); + if(comboBox->getSimple() == "") + { + comboBox->remove(0); + } + comboBox->add(LLStringUtil::null); + + comboBox->setSelectedByValue(text, true); + if(LLFloaterDayCycle::isOpen()) + { + keyCombo->add(text); + keyCombo->sortByName(); + } + LLWLParamManager::instance()->mDay.saveDayCycle(text); + + // otherwise, send a message to the user + } + else + { + LLNotifications::instance().add("ExistsSkyPresetAlert"); + } + } + return false; +} + +void LLFloaterDayCycle::onChangePresetName(LLUICtrl* ctrl, void * userData) +{ + + LLComboBox * combo_box = static_cast(ctrl); + + if(combo_box->getSimple() == "") + { + return; + } + + LLWLParamManager::instance()->mDay.loadDayCycle(combo_box->getSelectedValue().asString()); + gSavedSettings.setString("AscentActiveDayCycle", combo_box->getSelectedValue().asString()); + // sync it all up + syncSliderTrack(); + syncMenu(); + + // set the param manager's track to the new one + LLMultiSliderCtrl* tSldr; + tSldr = sDayCycle->getChild( + "WLTimeSlider"); + LLWLParamManager::instance()->resetAnimator( + tSldr->getCurSliderValue() / sHoursPerDay, false); + + // and draw it + LLWLParamManager::instance()->mAnimator.update( + LLWLParamManager::instance()->mCurParams); +} + void LLFloaterDayCycle::onRunAnimSky(void* userData) { // if no keys, do nothing @@ -307,8 +562,8 @@ void LLFloaterDayCycle::onStopAnimSky(void* userData) void LLFloaterDayCycle::onUseLindenTime(void* userData) { - LLFloaterWindLight* wl = LLFloaterWindLight::instance(); - LLComboBox* box = wl->getChild("WLPresetsCombo"); + LLFloaterDayCycle* dc = LLFloaterDayCycle::instance(); + LLComboBox* box = dc->getChild("DayCyclePresetsCombo"); box->selectByValue(""); LLWLParamManager::instance()->mAnimator.mIsRunning = true; @@ -317,7 +572,7 @@ void LLFloaterDayCycle::onUseLindenTime(void* userData) void LLFloaterDayCycle::onLoadDayCycle(void* userData) { - LLWLParamManager::instance()->mDay.loadDayCycle("Default.xml"); + //LLWLParamManager::instance()->mDay.loadDayCycle("Default.xml"); // sync it all up syncSliderTrack(); @@ -337,7 +592,7 @@ void LLFloaterDayCycle::onLoadDayCycle(void* userData) void LLFloaterDayCycle::onSaveDayCycle(void* userData) { - LLWLParamManager::instance()->mDay.saveDayCycle("Default.xml"); + //LLWLParamManager::instance()->mDay.saveDayCycle("Default.xml"); } diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h index d23003554..17330f8ca 100644 --- a/indra/newview/llfloaterdaycycle.h +++ b/indra/newview/llfloaterdaycycle.h @@ -99,10 +99,30 @@ public: /// delete a key frame static void onDeleteKey(void* userData); - /// button to load day + /// when user hits the load preset button + static void onNewPreset(void* userData); + + /// when user hits the save preset button + static void onSavePreset(void* userData); + + /// prompts a user when overwriting a preset + static bool saveAlertCallback(const LLSD& notification, const LLSD& response); + + /// when user hits the save preset button + static void onDeletePreset(void* userData); + + /// prompts a user when overwriting a preset + bool deleteAlertCallback(const LLSD& notification, const LLSD& response); + + static bool newPromptCallback(const LLSD& notification, const LLSD& response); + + /// what to do when you change the preset name + static void onChangePresetName(LLUICtrl* ctrl, void* userData); + + /// button to load day OLD -HgB static void onLoadDayCycle(void* userData); - /// button to save day + /// button to save day OLD -HgB static void onSaveDayCycle(void* userData); /// toggle for Linden time @@ -140,6 +160,9 @@ private: // map of sliders to parameters static std::map sSliderToKey; + //Presets default + static std::set sDefaultPresets; + static const F32 sHoursPerDay; }; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 68f63a7a2..56e2713c4 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -193,11 +193,13 @@ #include "llsocks5.h" #include "jcfloaterareasearch.h" + // #include "llpanellogin.h" //#include "llfloateravatars.h" //#include "llactivation.h" #include "wlfPanel_AdvSettings.h" //Lower right Windlight and Rendering options +#include "ascentdaycyclemanager.h" #include "llao.h" #include "llfloaterblacklist.h" #include "scriptcounter.h" @@ -2528,6 +2530,7 @@ bool idle_startup() // init the shader managers LLPostProcess::initClass(); LLWLParamManager::initClass(); + AscentDayCycleManager::initClass(); LLWaterParamManager::initClass(); // RN: don't initialize VO classes in drone mode, they are too closely tied to rendering diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5a8359ae7..1cdfa6a1a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3744,16 +3744,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) { estate_owner = parent_estate->getOwner(); } - /*this->getClientInfo - std::string name; - name += firstname->getString(); - name += " "; - name += lastname->getString(); + //Lindens are always more Linden than your friend, make that take precedence - if(LLMuteList::getInstance()->isLinden(name)) + if(LLMuteList::getInstance()->isLinden(getFullname())) { mClientColor = gCOASavedSettings->getColor4("AscentLindenColor").getValue(); - }*/ + } //check if they are an estate owner at their current position else if(estate_owner.notNull() && this->getID() == estate_owner) { @@ -9398,7 +9394,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) } if( param ) { - llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl; + if (param->getName() == "tattoo_red") + llinfos << getFullname() << " does not have tattoo tinting." << llendl; + else + llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl; //return; //ASC-TTRFE } diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index 1d17c6047..2abf9d45a 100644 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -40,7 +40,9 @@ #include -LLWLDayCycle::LLWLDayCycle() : mDayRate(120) +LLWLDayCycle::LLWLDayCycle() : + mDayRate(120), + mName("Unnamed Cycle") { } @@ -54,22 +56,39 @@ void LLWLDayCycle::loadDayCycle(const std::string & fileName) // clear the first few things mTimeMap.clear(); - // now load the file - std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, - "windlight/days", fileName)); - llinfos << "Loading DayCycle settings from " << pathName << llendl; - - llifstream day_cycle_xml(pathName); - if (day_cycle_xml.is_open()) + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_escape(fileName.c_str(), fileName.size()); + std::string escaped_filename(curl_str); + curl_free(curl_str); + curl_str = NULL; + + escaped_filename += ".xml"; + + std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", escaped_filename)); + llinfos << "Loading Day Cycle preset from " << pathName << llendl; + + llifstream day_cycle_xml; + day_cycle_xml.open(pathName.c_str()); + + // That failed, try loading from the users area instead. + if(!day_cycle_xml) + { + pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", escaped_filename); + llinfos << "Loading User Day Cycle preset from " << pathName << llendl; + day_cycle_xml.open(pathName.c_str()); + } + + if (day_cycle_xml) { // load and parse it LLSD day_data(LLSD::emptyArray()); LLPointer parser = new LLSDXMLParser(); parser->parse(day_cycle_xml, day_data, LLSDSerialize::SIZE_UNLIMITED); - + llinfos << "Loading day cycle into timeline..." << llendl; // add each key for(S32 i = 0; i < day_data.size(); ++i) { + llinfos << "Loading value" << i << llendl; // make sure it's a two array if(day_data[i].size() != 2) { @@ -95,14 +114,39 @@ void LLWLDayCycle::loadDayCycle(const std::string & fileName) day_cycle_xml.close(); } + else + { + llwarns << "Can't find " << fileName << llendl; + return; + } } void LLWLDayCycle::saveDayCycle(const std::string & fileName) { - LLSD day_data(LLSD::emptyArray()); + + // bugfix for SL-46920: preventing filenames that break stuff. + char * curl_str = curl_escape(fileName.c_str(), fileName.size()); + std::string escaped_filename(curl_str); + curl_free(curl_str); + curl_str = NULL; - std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", fileName)); - //llinfos << "Saving WindLight settings to " << pathName << llendl; + escaped_filename += ".xml"; + + std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", escaped_filename)); + llinfos << "Saving Day Cycle preset from " << pathName << llendl; + + llofstream day_cycle_xml; + day_cycle_xml.open(pathName.c_str()); + + // That failed, try loading from the users area instead. + if(!day_cycle_xml) + { + pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", escaped_filename); + llinfos << "Saving User Day Cycle preset from " << pathName << llendl; + day_cycle_xml.open(pathName.c_str()); + } + + LLSD day_data(LLSD::emptyArray()); for(std::map::const_iterator mIt = mTimeMap.begin(); mIt != mTimeMap.end(); @@ -114,7 +158,6 @@ void LLWLDayCycle::saveDayCycle(const std::string & fileName) day_data.append(key); } - llofstream day_cycle_xml(pathName); LLPointer formatter = new LLSDXMLFormatter(); formatter->format(day_data, day_cycle_xml, LLSDFormatter::OPTIONS_PRETTY); day_cycle_xml.close(); diff --git a/indra/newview/llwldaycycle.h b/indra/newview/llwldaycycle.h index f045a6d1b..d886317a2 100644 --- a/indra/newview/llwldaycycle.h +++ b/indra/newview/llwldaycycle.h @@ -45,6 +45,9 @@ class LLWLDayCycle; class LLWLDayCycle { + +public: + std::string mName; public: // lists what param sets are used when during the day diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index b8a2bf0bd..c4d146664 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -553,7 +553,7 @@ LLWLParamManager * LLWLParamManager::instance() sInstance->loadPresets(LLStringUtil::null); // load the day - sInstance->mDay.loadDayCycle(std::string("Default.xml")); + sInstance->mDay.loadDayCycle(gSavedSettings.getString("AscentActiveDayCycle")); // *HACK - sets cloud scrolling to what we want... fix this better in the future sInstance->getParamSet("Default", sInstance->mCurParams); diff --git a/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml index 84812b9de..ab31d1ea6 100644 --- a/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml @@ -237,14 +237,36 @@ label="Use Estate Time" label_selected="Go to Estate Time" left_delta="55" mouse_opaque="true" name="WLUseLindenTime" scale_image="true" width="140" /> -