Commit Graph

39962 Commits (2ec0ccb628e8fa2e8affe27dde4e4dab0906b5c5)

Author SHA1 Message Date
Andrey Lihatskiy 942a37d969 Merged in ruslantproductengine/viewer-cougar-4cr-5 (pull request #41)
SL-10176  - [Love Me Render] MacOS Quit / Shutdown crash

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2019-01-14 23:27:05 +00:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
ruslantproductengine f6bccd6f9e - remove getDeviceScaleFactor() and replace it to getSystemUISize() according Ansariel note 2019-01-14 19:07:00 +02:00
ruslantproductengine 4f458882f4 - add static const 2019-01-14 18:58:30 +02:00
maxim_productengine 127ed9c678 SL-10352 FIXED 'Search menus' disappears after entering and exiting mouselook view 2019-01-14 13:50:28 +02:00
maxim_productengine 9c8584a3a7 SL-10327 FIXED Scalable preview of mesh model is shown with black bar on top in the Upload Model menu 2019-01-11 17:39:26 +02:00
AndreyL ProductEngine c42202804c Merged INTL-324 and INTL-327 2019-01-11 04:11:05 +02:00
eli aa1d4c0dc9 FIX INTL-327 German misspellings 2019-01-10 16:53:31 -08:00
eli 02aa64e195 FIX INTL-324 Viewer Set55 translation (viewer-neko) 2019-01-10 16:46:49 -08:00
maxim_productengine fdf39d3cf4 SL-10329 Increase panel height to avoid message overlapping 2019-01-10 15:41:48 +02:00
maxim_productengine 1349eacc5c SL-10325 FIXED Preferences tabs are displayed incorrectly if hovering it while searching any keyword 2019-01-09 17:21:13 +02:00
maxim_productengine cd859cd9e8 SL-10321 FIXED 'Uploads' tab is not displayed after any search in Preferences 2019-01-09 10:57:15 +02:00
AndreyL ProductEngine 3b9b6877a1 Merged in lindenlab/viewer-bear 2019-01-08 23:42:58 +02:00
Brad Payne (Vir Linden) b417be1781 SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue. 2019-01-08 21:28:47 +00:00
AndreyL ProductEngine 3bd5160202 Merged in callum_linden/viewer-release-cve-2019-5786 2019-03-16 01:33:25 +02:00
AndreyL ProductEngine 83d5c2b359 Merged in callum_linden/viewer-release-cve-2019-5786 2019-03-14 19:55:44 +02:00
AndreyL ProductEngine e4f6e7d842 Merged in lindenlab/viewer-release and incremented viewer version to 6.2.0 2019-03-01 20:03:14 +02:00
AndreyL ProductEngine 3e0e141b76 SL-1036 Update estate access lists on the agent's access level change 2019-02-07 21:59:13 +02:00
AndreyL ProductEngine 7621b34273 SL-1942 Fixed the estate list change Confirmation messages to show agent names properly 2019-01-18 18:19:27 +02:00
Brad Payne (Vir Linden) 4316f1d322 SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue. 2019-01-08 21:28:47 +00:00
ruslantproductengine 2e55e529d4 SL-10194 Selecting mesh face doesn't highlight the face in any way
- Implemented
2019-01-08 18:26:34 +02:00
maxim_productengine 2461a7fe39 SL-10320 FIXED Crash in LLVOAvatar::updateAttachmentOverrides() 2019-01-08 14:15:44 +02:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
maxim_productengine ab428e194e SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture 2019-01-04 10:57:49 +02:00
andreykproductengine 9a0f376708 SL-8963 Fixed Long name of region overlaps with next one on the World map 2019-01-03 16:45:17 +02:00
AndreyL ProductEngine 76369c2463 SL-10288 comments cleanup 2019-01-03 14:30:01 +02:00
AndreyL ProductEngine 9a24c728d8 SL-10288 settings.xml fix 2019-01-03 01:19:41 +02:00
AndreyL ProductEngine efa5f24d1b SL-10288 Mesh uploader changes from Firestorm 2019-01-03 00:35:38 +02:00
maxim_productengine 0acab8ba2d SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube 2018-12-24 15:57:04 +02:00
Mnikolenko ProductEngine b08065dafd SL-10155 FIXED [MAC] Mesh upload tries to upload folder instead of opening it 2018-12-19 18:39:59 +02:00
maxim_productengine 224c657163 SL-10235 FIXED Texture tab is opened with Bumpiness or Shininess instead of Texture as default value 2018-12-18 17:23:55 +02:00
maxim_productengine 2b2b6d4084 SL-10251 show correct fee for 'save to disk' option on Japanese localization 2018-12-18 11:41:32 +02:00
Nat Goodspeed 4b99e6a1f1 SL-10252: On Windows, use $SystemRoot again, not FOLDERID_Fonts. 2018-12-17 15:23:57 -05:00
Nat Goodspeed 11f23ca436 Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat 2018-12-16 13:51:52 -05:00
Nat Goodspeed f5f504b0f9 DRTVWR-447: Merge up to latest viewer-release 2018-12-16 13:51:15 -05:00
Nat Goodspeed 4a13657285 SL-10153: auto name{expression} declares an initializer_list
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-15 09:13:24 -05:00
AndreyL ProductEngine 71b3a97a09 increment viewer version to 6.1.0 2018-12-15 15:25:59 +02:00
AndreyL ProductEngine 82aefc8fa6 Merged in lindenlab/viewer-release 2018-12-15 15:24:16 +02:00
Nat Goodspeed 3c53f8abde SL-10153: VS 2013 isn't so fond of ?: involving std::string. 2018-12-14 16:00:09 -05:00
Nat Goodspeed c4096f670c SL-10153: Review and rationalize fetching paths from environment.
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-14 15:38:13 -05:00
Nat Goodspeed 132e708fec SL-10153: Fix previous commit for non-Windows systems.
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-14 12:01:51 -05:00
Nat Goodspeed 9ffcafb64b SL-10153: Introduce ll_convert, windows_message() templates.
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-14 10:48:43 -05:00
AndreyL ProductEngine 74a56f30aa Merged in lindenlab/viewer-release 2018-12-14 00:46:11 +02:00
Nat Goodspeed a3b3ad727f increment viewer version to 6.0.2 2018-12-13 16:46:12 -05:00
Nat Goodspeed 1de96a0a85 Added tag 6.0.1-release for changeset 21b7604680ef 2018-12-13 16:46:11 -05:00
andreykproductengine 514e4f661b SL-10236 The "Attach To", "Attach To HUD", and "Wear" options aren't greyed out 2018-12-13 20:01:01 +02:00
maxim_productengine bf2efcf43e SL-10233 FIXED 'Default' button doesn't work in 'Pick:Texture' floater for multiple selections with different textures 2018-12-14 16:48:54 +02:00
AndreyL ProductEngine 2d94edf250 Merged in lindenlab/viewer-lynx 2018-12-14 00:42:13 +02:00
Nat Goodspeed cbf4295b63 SL-10153: Update to viewer-manager build 522507 2018-12-13 12:02:38 -05:00
maxim_productengine 5111e0c921 SL-10229 FIXED Group icon doesn't display by default in the People and Profile floaters after creating new group 2018-12-13 18:21:11 +02:00