summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-08Merged in andreykproductengine/maint-eep (pull request #220)Rider Linden
SL-10060 EEP Add reset default sky altitudes functionality
2019-01-08Merged in graham_linden/viewer-eep-sl-10305 (pull request #221)Rider Linden
SL-10305
2019-01-08SL-10268, SL-10323: Use _script_perm to display sit and change env ↵Rider Linden
questions. Exp log messages for environment changes."
2019-01-08SL-10305 fix post deferred gamma correction to address ALM mismatch with ↵Graham Linden
non-ALM lighting.
2019-01-08SL-10060 EEP Add reset default sky altitudes functionalityandreykproductengine
2019-01-08MergeGraham Linden
2019-01-08Merged in andreykproductengine/maint-eep (pull request #219)Rider Linden
SL-10280 Added label repositioning code to display percentage in correct places. Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2019-01-08Merged in graham_linden/viewer-eep-sl-10304 (pull request #218)Rider Linden
SL-10304
2019-01-08SL-10280 Added label repositioning code to display percentage in correct places.andreykproductengine
2019-01-07SL-10067, SL-9917: Updated UUIDs for sun and moon textures and to corrected ↵Rider Linden
known skies.
2019-01-07SL-10304 fix handling of water normal map blending when both current and ↵Graham Linden
next textures are identical.
2019-01-07SL-9883: Hide controls and display message if parcel < 128mRider Linden
2019-01-07MergeGraham Linden
2019-01-04SL-10041, SL-9758: Environment tab is disabled(shows can't do this) when EM ↵Rider Linden
does not allow parcel override. "Commit" button now reads "Apply to Parcel" or "Apply to Region" as needed.
2019-01-04MergeGraham Linden
2019-01-04Added new LLSINGLETON macro that includes override keyword.Rider Linden
2019-01-04MergeGraham Linden
2019-01-04Convert to using shared shadow sampling function (reduce duplicated code ↵Graham Linden
blocks in several shaders).
2019-01-04MergeRider Linden
2019-01-04Move some estate requests into the LLEstateInfoModel and out of the Region ↵Rider Linden
floater. Fix issue where user could potentially be looking at one set of estate options and update the estate they were standing in by mistake.
2019-01-04MergeGraham Linden
2019-01-04Add new shaders for generating shadows from clouds.Graham Linden
Add new class3 shadow shaders for VSM shadows. Add disabled shadow pass in WLSky for using above.
2019-01-04SL-10279 Fix altitude description repositioning codeandreykproductengine
2019-01-03Fix per-frag fullbright soft clip convenience funcs to include additive and ↵Graham Linden
atten args.
2019-01-03Fix two files stomped my merging VR before a downstream branch.Graham Linden
2019-01-03MergeGraham Linden
2019-01-03Merge VRGraham Linden
2019-01-02SL-10279: Temp fix for stale estate info when editing parcel environment.Rider Linden
2019-01-02SL-10279: Most functionality now present. Still needs some cleanup on the ↵Rider Linden
bump code.
2018-12-21MergeRider Linden
2018-12-21SL-10279: Rework the environment pannel. Still in progress.Rider Linden
2018-12-21SL-10275 FIXED [EEP] Pressing Enter while setting "Settings From Inventory" ↵maxim_productengine
opens the Day Cycle
2018-12-20SL-10274 FIXED [EEP] Settings object created by Save As cannot be copied ↵maxim_productengine
from an object
2018-12-19Add new shaders for advanced atmo SH env lighting calcs.Graham Linden
2018-12-19Fix broken culling when rendering water reflection (unstable for many scene ↵Graham Linden
elements when 'Everything' is turned on).
2018-12-17MergeGraham Linden
2018-12-17SL-10252: On Windows, use $SystemRoot again, not FOLDERID_Fonts.Nat Goodspeed
2018-12-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplatNat Goodspeed
2018-12-16DRTVWR-447: Merge up to latest viewer-releaseNat Goodspeed
2018-12-15SL-10153: auto name{expression} declares an initializer_listNat Goodspeed
instead of a variable of type decltype(expression). Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem() requires new Windows #include files. A variable with a constructor can't be declared within the braces of a switch statement, even outside any of its case clauses.
2018-12-14SL-10241: Group roll for changing environment.Rider Linden
2018-12-14SL-10153: VS 2013 isn't so fond of ?: involving std::string.Nat Goodspeed
2018-12-14SL-10153: Review and rationalize fetching paths from environment.Nat Goodspeed
Use LLStringUtil::getenv() or getoptenv() whenever we fetch a string that will be used as a pathname. Use LLFile::tmpdir() instead of getenv("TEMP"). As an added extra-special bonus, finally clean up $TMP/llcontrol-test-zzzzzz directories that have been accumulating every time we run a local build!
2018-12-14SL-10153: Fix previous commit for non-Windows systems.Nat Goodspeed
Move Windows-flavored llstring_getoptenv() to Windows-specific section of llstring.cpp. boost::optional type must be stated explicitly to initialize with a value. On platforms where llwchar is the same as wchar_t, LLWString is the same as std::wstring, so ll_convert specializations for std::wstring would duplicate those for LLWString. Defend against that. The compilers we use don't like 'return condition? { expr } : {}', in which we hope to construct and return an instance of the declared return type without having to restate the type. It works to use an explicit 'if' statement.
2018-12-14SL-10153: Introduce ll_convert, windows_message() templates.Nat Goodspeed
Add ll_convert<TO, FROM> template, used as (e.g.): ll_convert<std::string>(value_of_some_other_string_type); There is no generic template implementation -- the template exists solely to provide generic aliases for a bewildering family of llstring.h string- conversion functions with highly-specific names. There's a generic implementation, though, for the degenerate case where FROM and TO are identical. Add ll_convert<> specialization aliases for most of the string-conversion functions declared in llstring.h, including the Windows-specific ones involving llutf16string and std::wstring. Add a mini-lecture in llstring.h about appropriate use of string types on Windows. Add LL_WCHAR_T_NATIVE llpreprocessor.h macro so we can detect whether to provide separate conversions for llutf16string and std::wstring, or whether those would collide because the types are identical. Add inline ll_convert_wide_to_string(const std::wstring&) overloads so caller isn't required to call arg.c_str(), which naturally permits an ll_convert alias. Add ll_convert_wide_to_wstring(), ll_convert_wstring_to_wide() as placeholders for converting between Windows std::wstring and Linden LLWString, with corresponding ll_convert aliases. We don't yet have library code to perform such conversions officially; for now, just copy characters. Add LLStringUtil::getenv(key) and getoptenv(key) functions. The latter returns boost::optional<string_type> in case the caller needs to detect absence of a given environment variable rather than simply accepting a default value. Naturally getenv(), which accepts a default, is implemented using getoptenv(). getoptenv(), in turn, is implemented using an underlying llstring_getoptenv(). On Windows, llstring_getoptenv() returns boost::optional<std::wstring> (based on GetEnvironmentVariableW()), whereas elsewhere, llstring_getoptenv() returns boost::optional<std::string> (based on classic Posix getenv()). The beauty of generic ll_convert is that the portable LLStringUtilBase<T>:: getoptenv() template can call the platform-specific llstring_getoptenv() and transparently perform whatever conversion is necessary to return the desired string_type. Add windows_message<T>(error) template, with an overload that implicitly calls GetLastError(). We provide a single concrete windows_message<std::wstring>() implementation because that's what we get from Windows FormatMessageW() -- everything else is a generic conversion to the desired target string type. This obviates llprocess.cpp's previous WindowsErrorString() implementation -- reimplement using windows_message<std::string>().
2018-12-13MergeRider Linden
2018-12-13increment viewer version to 6.0.2Nat Goodspeed
2018-12-13Added tag 6.0.1-release for changeset 21b7604680efNat Goodspeed
2018-12-13SL-10153: Update to viewer-manager build 522507Nat Goodspeed
2018-12-12MergeRider Linden