Commit Graph

57033 Commits (81b58bbda74fa52e1ff479a43ae35ca2b0a930d1)

Author SHA1 Message Date
Ansariel 81b58bbda7 Merge viewer-neko 2019-05-07 23:21:06 +02:00
AndreyL ProductEngine baef0d5799 Merged in lindenlab/viewer-bear 2019-05-08 00:07:01 +03:00
Ansariel 13d4d865e9 Merge Firestorm LGPL 2019-05-07 22:36:32 +02:00
Ansariel d34e4e850f Merge LL viewer-release 6.2.1 2019-05-07 22:33:43 +02:00
Nat Goodspeed 34322f8f37 increment viewer version to 6.2.2 2019-05-07 15:24:01 -04:00
Nat Goodspeed 031ebc8d6d Added tag 6.2.1-release for changeset 706bdc7e25c6 2019-05-07 15:24:00 -04:00
andreykproductengine 553d06bf1c SL-10423 Detect potentially bad install 2019-05-07 16:41:47 +03:00
maxim_productengine a6cc3b7159 SL-11074 FIXED "Cache Hit Rate" in Statistics is broken 2019-05-06 17:14:55 +03:00
maxim_productengine 30061fd327 SL-11069 FIXED Experiences search resets the "Max Content Rating" back to general each session. 2019-05-06 14:36:05 +03:00
Ansariel a92b7f3f3b Update German translation 2019-05-04 01:03:59 +02:00
Ansariel 6d377d07fa Merge viewer-neko 2019-05-04 01:02:28 +02:00
Ansariel 53ce33aaa9 Merge Firestorm LGPL Bear 2019-05-03 23:11:40 +02:00
Ansariel 8b75f941c0 Merge viewer-bear 2019-05-03 23:06:01 +02:00
Ansariel d686d2025b Merge Firestorm LGPL 2019-05-03 19:48:09 +02:00
Ansariel 2b3a380faf Update German translation 2019-05-03 19:47:13 +02:00
andreykproductengine 7072b34b8b SL-11093 panel_login_first cleanup 2019-05-03 18:47:26 +03:00
andreykproductengine e650069a44 SL-11058 Better delay logic 2019-05-03 14:50:54 +03:00
Liny 8df7a9f3a3 FIRE-23939 Add ability to specify coordinates to TELEPORT TO SIM X (mapto) chat command
Usage "cmd regionname | x y z"
2019-05-02 16:57:56 -07:00
Nicky d6626fe5f5 FIRE-22751; Dullahan update for Linux x64. 2019-05-02 22:47:42 +02:00
andreykproductengine 99ab1ccf93 SL-4186 Mesh model rename before upload shows old model name on rez 2019-05-02 23:06:59 +03:00
andreykproductengine 219944d14e SL-11058 Viewer "Voice is down" dialogs can stack up 2019-05-02 18:34:06 +03:00
Andrey Lihatskiy 97c2c3b0b9 Merged in default (pull request #844)
couple trivial changes

Approved-by: Andrey Kleshchev
2019-05-02 13:43:30 +00:00
maxim_productengine 9ac1090402 SL-10992 FIXED SLURLs and SLApp links are translated in chat when using the translator 2019-05-02 10:47:30 +03:00
AndreyL ProductEngine 09dc92b264 SL-10334 Increased allowed sound clip length from 10s to 30s 2019-05-02 02:04:07 +03:00
AndreyL ProductEngine 88b72bcc3f SL-11081 Renamed the abuse category for Skill gaming 2019-05-02 01:07:18 +03:00
AndreyL ProductEngine ca0fd82199 Merged in lindenlab/viewer-lynx 2019-05-01 12:28:39 +03:00
AndreyL ProductEngine d6a3fb9100 Merged in lindenlab/viewer-bear 2019-05-01 12:17:44 +03:00
Graham Linden 81c39d28fe Fix spurious assert from using highlights without binding highlight shader.
Only affects devs, but could have downstream consequences for rendering.
2019-04-30 14:25:48 -07:00
Andrey Lihatskiy b088ab2b3a Merged in default (pull request #87)
SL-11049: Try harder to honor command-line --grid switch.

Approved-by: Andrey Lihatskiy
Approved-by: Andrey Kleshchev
2019-04-30 14:18:50 +00:00
andreykproductengine 3961a9e80a SL-11061 Viewer crashes on launch if serial is either unset or does not return a string 2019-04-30 15:24:49 +03:00
andreykproductengine 47bb094b47 SL-10565 LLMachineID crashes 2019-04-30 15:23:06 +03:00
Nicky 405327d19e Windows: Handle systems where WMI does not return a serial as BSTR (which means it refuses to/cannot return a serial at all). 2019-04-28 17:54:03 +02:00
PanteraPolnocy f732cf7deb Polish translation update 2019-04-27 22:26:48 +02:00
AndreyL ProductEngine 5e5c5ca09c Merged SL-10400 and SL-10401 2019-04-26 21:02:00 +03:00
Nat Goodspeed 0d596aa4de Automated merge with file:///Users/nat/linden/viewer-gridselect 2019-04-26 11:17:53 -04:00
Brad Payne (Vir Linden) a44f03573d SL-10400 - more on group limits from SimulatorFeatures 2019-04-26 14:23:57 +01:00
Brad Payne (Vir Linden) 06009e9b53 SL-10400 - get group limits from SimulatorFeatures 2019-04-25 22:02:47 +01:00
Nat Goodspeed 70aa89f708 SL-11049: Notice explicit --grid command-line switch and honor it.
LLPanelLogin's constructor checks both LLGridManager::getGrid() and
LLStartUp::getStartSLURL(). But by the time we get there, we've blurred the
distinction between explicit command-line arguments and defaults left over
from a previous run. Of course, if the grid implied by getStartSLURL() is the
same as the getGrid(), the distinction is irrelevant.

But if they differ, up until now, getStartSLURL() has always "won" -- even
when getGrid() was set by an explicit --grid switch whereas getStartSLURL()
was only left over from a previous run.

Notice that case and try to avoid overriding the explicitly-specified grid
with the grid from the default SLURL.
2019-04-25 15:48:20 -04:00
Nat Goodspeed a2d4122de4 Reorder logic in LLAppViewer::initConfiguration(); remove dup code.
There were two nearly-identical copies of a stanza that calls
sendURLToOtherInstance(). Remove one.

It's possible that the reason no one noticed the duplication was because the
two copies were 70 lines apart. Move setSkinFolder(), setUseSpellCheck() and
setSecondaryDictionaries() stanzas to consolidate SLURL-handling code more
closely. Also move logic for NextLoginLocation and CmdLineLoginLocation.

Remove a couple unnecessary std::ostringstream instances. Streaming a single
string literal to std::ostringstream and retrieving its str() is the same as simply
converting the literal to std::string, only slower.

OSMessageBox() accepts const std::string&. Given that you have a std::string
in hand, passing its c_str() to OSMessageBox() is not only unnecessary but
wasteful: it requires silently converting the const char* back to a different
std::string instance.

Calling a class method from another method of the same class does not require
ClassName:: qualification. Calling a singleton subclass method from another
non-static method of the same subclass does not require going through
ClassName::instance() or sInstance or whatever.
2019-04-25 15:40:44 -04:00
Nat Goodspeed 468fbd6b51 Return CGPoint and CGSize by value, not const ref to temporary. 2019-04-25 15:11:55 -04:00
Nat Goodspeed 778bfc932f Remove a couple unused iterators per Xcode 10.2.1. 2019-04-25 15:10:19 -04:00
Ansariel 5cdd039956 Merge Firestorm LGPL 2019-04-25 18:30:00 +02:00
Ansariel a767226494 Update German translation 2019-04-25 18:27:12 +02:00
Ansariel 8dfb7d571e Merge viewer-neko 2019-04-24 21:05:58 +02:00
ruslantproductengine 27ebf0dc63 SL-10811 - [Render][OSX] Google’s search results page is not fully displayed in the Media Browser if HiDPI is enabled.
SL-10813 - [Render][OSX] HiDPI browser has black bars on the sides.
Fixed.
2019-04-24 18:20:34 +03:00
Andrey Lihatskiy 85b431d513 Merged in default (pull request #839)
SL-10994 Removed Facebook In-world Sharing

Approved-by: Andrey Kleshchev
2019-04-24 12:01:25 +00:00
maxim_productengine 79dbdc99b3 SL-11013 FIXED The Ban Duration ‘Temporary’ radio button and text are badly pressed when hovering them 2019-04-24 12:25:37 +03:00
AndreyL ProductEngine ba90f3a8e4 SL-10994 Removed Facebook In-world Sharing
SL-11024 Fixed Twitter connect failure
2019-04-24 02:24:42 +03:00
andreykproductengine 8a79174b0a SL-11022 Proxy port number is limited to 12K instead of 65K 2019-04-23 21:56:27 +03:00
maxim_productengine 3839444abe SL-11002 FIXED 'Created by me' and 'Created by others' checkboxes are not reset using 'Reset Filters' 2019-04-23 18:10:48 +03:00