Commit Graph

2216 Commits (e0004e744e449f9210556bf8c3246de55b67b248)

Author SHA1 Message Date
Ansariel e0004e744e Merge Firestorm LGPL 2019-10-09 22:09:22 +02:00
PanteraPolnocy 3dadd1a95b Changed phoenixviewer.com to firestormviewer.org in few applicable places
Obviously, search & replace (for XML files), plus some manual reviewing
2019-10-07 09:54:33 +02:00
Ansariel 438bb8c113 Merge viewer-neko 2019-09-10 20:03:09 +02:00
andreykproductengine e29b3605c3 SL-11315 Viewer asks to play media and retains selected choice 2019-09-05 17:15:57 +03:00
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
Ansariel b69aff5a05 Merge viewer-neko 2019-07-05 18:04:36 +02:00
andreykproductengine 8c54233ef9 SL-1566 Fixed watchdog killer event line missing from crash log 2019-07-01 21:24:52 +03:00
Ansariel 9337241cc7 Merge Firestorm LGPL 2019-06-20 09:48:19 +02:00
ziree 872c0bff62 FIRE-22353: use a marker file instead of a settings control for inventory cache purging. Hopefully helps with cases where the setting gets lost. 2019-06-18 02:55:36 +02:00
Ansariel 89a6a001fc Merge viewer-neko 2019-06-17 21:48:11 +02:00
andreykproductengine d72fcfba57 SL-11402 Resaving home image if file does not exist 2019-06-13 19:00:20 +03:00
andreykproductengine 04e67fa12d SL-11402 Last session image should be saved as png 2019-06-12 19:12:09 +03:00
andreykproductengine 19221d9ccf SL-11402 Save last session image per grid 2019-06-12 16:17:37 +03:00
andreykproductengine 930bf680c2 SL-10423 Dump path data when missing critical file 2019-06-03 21:37:43 +03:00
Ansariel c328e340d2 Merge Firestorm LGPL 2019-05-21 19:19:06 +02:00
Ansariel 601a763cb3 Merge LL viewer-release 6.2.2 2019-05-21 18:04:57 +02:00
AndreyL ProductEngine f5e63b0627 Merged in lindenlab/viewer-bear 2019-05-21 18:27:35 +03:00
Steven Harrison (steven) 59c93cb861 SL-11213 No longer embedding the channel in the viewer release note urls. Update base URLs to match new viewer release note URL 2019-05-17 02:23:49 +00:00
Ansariel 81b58bbda7 Merge viewer-neko 2019-05-07 23:21:06 +02:00
andreykproductengine 553d06bf1c SL-10423 Detect potentially bad install 2019-05-07 16:41:47 +03: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
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
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
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
Brad Payne (Vir Linden) d1f5e87ad0 via viewer-neko - don't crash test viewer due to missing version checker 2019-04-23 15:31:25 +01:00
AndreyL ProductEngine b78b5da79a Merged in lindenlab/viewer-bear 2019-04-26 21:11:16 +03:00
Ansariel 579b76dcf3 Merge viewer-neko 2019-04-15 12:40:44 +02:00
andreykproductengine c9cc8f6dde Don't crash Test Viewer due to missing version checker 2019-04-10 21:31:01 +03:00
andreykproductengine f7f939ecf2 Don't crash Test Viewer due to missing version checker 2019-04-10 16:17:55 +03:00
maxim_productengine 5966831b0c SL-10881 Add HiDPI status to Help - About Second Life report 2019-04-04 13:20:36 +03:00
Ansariel 84d721c678 Merge Firestorm LGPL 2019-04-02 23:01:30 +02:00
AndreyL ProductEngine 65bf63c973 Merged in lindenlab/viewer-bear 2019-04-02 22:12:55 +03:00
AndreyL ProductEngine 1470e82c89 Merged in lindenlab/viewer-release 2019-04-02 21:51:54 +03:00
Ansariel 4858f7f48f Merge viewer-bear 2019-03-25 19:14:06 +01:00
Brad Payne (Vir Linden) 4e73121719 Don't create updater when running under debugger. 2019-03-04 20:24:00 +00:00
Ansariel fff9fdf9ba Merge Firestorm LGPL 2019-03-02 01:40:58 +01:00
Ansariel c96314964a Merge Firestorm LGPL 2019-03-01 17:36:52 +01:00
AndreyL ProductEngine 5715cda6e0 Merged in lindenlab/viewer-release 2019-03-01 10:55:47 +02:00
AndreyL ProductEngine 36cb6933e6 Merged in lindenlab/viewer-release 2019-03-01 02:24:00 +02:00
Ansariel 146792d98d Merge Firestorm LGPL 2019-02-17 11:44:08 +01:00
Ansariel 53cea223fe Merge Firestorm LGPL 2019-02-14 19:56:05 +01:00
Ansariel 0984f0c299 Merge Firestorm LGPL 2019-02-07 22:49:33 +01:00
Ansariel 92c9ddd65f Use APP_NAME and APP_NAME_ABBR default args instead of hardcoded viewer name 2019-02-02 19:43:24 +01:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
Ansariel 06ad0722ce Merge Firestorm LGPL 2018-12-16 02:11:33 +01:00
Ansariel b4ab48c849 Merge viewer-neko 2018-12-13 00:34:43 +01:00
andreykproductengine c94e981f40 SL-10080 clamp instead of llmax 2018-12-03 17:30:35 +02:00