Commit Graph

72 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
Ansariel ad0aa3422f Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Andrey Kleshchev e5cd4da823 SL-17035 Crash at gl_debug_callback
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
Andrey Kleshchev a09686bf54 SL-16953 Deprecated NoInventoryLibrary
Due to changes in SL-16715
2022-03-01 21:40:12 +02:00
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
Brad Payne (Vir Linden) 6d2714ac85 SL-15999 - added --noninteractive command line option 2021-09-16 14:22:28 +01:00
Ansariel 7fdc689a85 Merge viewer-eep 2019-03-21 20:54:50 +01:00
Rider Linden 122e2676ed Add a command line flag to prevent the viewer from launching the update checker. To use from debugger secondlife-bin->properties->Debugging->Command Arguments add "--skipupdatecheck" 2019-03-01 16:12:10 -08:00
Ansariel e6f9a5e2db Merge viewer64 2017-07-27 21:07:14 +02:00
Glenn Glazer aaaf4cb4ec Remove FAS from cmd_line.xml 2017-07-10 11:07:29 -07:00
Glenn Glazer 510202a4e2 MAINT-7571: detect if all HD cards are bad and addr is forced to 64, then stay at 64 bit 2017-07-07 14:49:36 -07:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel a3dc7915f4 And make it even more obvious... 2014-01-11 19:59:07 +01:00
Ansariel f2a82c4f5f Add some clearification to previous commit that it overrides video memory detection 2014-01-11 19:56:21 +01:00
Ansariel 25605a6fdb FIRE-12671: Add option to force VRAM if DirectX detection is broken on Windows 2014-01-11 19:49:22 +01:00
Oz Linden 86b4019684 merge changes for DRTVWR-333 2013-08-07 12:17:39 -04:00
Oz Linden d2dd3be08b CHOP-963: Add a new --update-service command line argument for QA use 2013-07-13 15:03:39 -04:00
Nat Goodspeed d8565b05a5 CHOP-959: Introduce CmdLineChannel settings var, map --channel to it. 2013-07-02 16:33:40 -04:00
Nat Goodspeed 09d8d17382 CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.
Route --url and --slurl command-line switches through a common settings
variable. Treat them uniformly now. (Previously, passing --url would notice a
grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.)
2013-07-02 15:30:49 -04:00
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Cinders 451ec1e5a1 FIRE-11794: Fix garbage being saved to UserLoginInfo 2013-11-12 07:40:55 -07:00
Tank_Master d60d8704a6 syntax fix 2013-08-29 18:54:19 -07:00
Cinders e50e4b330d Fix more merge regressions, update code to use updated UserLoginInfo setting 2013-08-29 15:09:26 -06:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nat Goodspeed f1ff284569 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-02 13:23:46 -04:00
Ansariel 331a4edbb5 FIRE-8520: Added "logindontsavepassword" cmdline option to disable default behavior of saving password when using "login" cmdline option 2013-02-08 12:27:17 +01:00
Cinders 87b6bf4ac3 Workaround for Xcode 4.6 adding an argument to the command line when running from the IDE 2013-01-30 20:14:14 -07:00
Tank_Master 9f4245779c Partial Merge of LL 3.4.2 Release 2012-12-10 15:56:46 -08:00
Nat Goodspeed b62cb3249c Fix --skin command-line switch by mapping to the correct var name.
It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is
correct.
2012-06-29 16:24:08 -04:00
Todd Stinson 3f17205889 Some clean-up after checking the differences between the pathfinding branch and viewer-release. 2012-06-26 12:27:08 -07:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Tank@test_master.ftrdhcpuser.net 01c7d1eafb Merge LL pathfinding
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
Nat Goodspeed cb38ceb89f Add --leap command-line switch to launch one or more LEAP plugins.
You can specify one or more instances of --leap 'command line'. Each such
command line is parsed using bash-like conventions, notably honoring double
quotes, e.g. --leap '"c:/Program Files/Something/something.exe" arg1 arg2'.
(Specifying such an argument in a Windows Command Prompt may be tricky.)
Such a program should read its stdin and write to its stdout using LLSD Event
API Plugin protocol: length:serialized_LLSD
where 'length' is the decimal integer count of bytes in serialized_LLSD,
':' is a literal colon character,
and 'serialized_LLSD' is notation-format LLSD.
A typical LLSD object is a map containing 'pump' and 'data' keys, where
'pump' is the name of the LLEventPump on which to send 'data' (or on which
'data' was received). In particular, the initial LLSD object on stdin mentions
the name of this plugin's reply LLEventPump: the LLEventPump that will send
every subsequent received event to the plugin's stdin.
Anything written to the plugin's stderr will be logged in the viewer log. In
addition to being generally useful, this helps debug problems with particular
plugins.
2012-03-14 15:42:22 -04:00
Armin Weatherwax 38a8d02321 fix FIRE-6721 (merge regression: commandline -login broken) 2012-06-23 11:41:15 +02:00
Tank_Master e757189f8d Merge LL 3.3.3 to FS LGPL 2012-06-22 09:52:28 -07:00
Armin Weatherwax 9d541a9a68 fix commandline loginuri (partial fix of FIRE-3448) 2012-06-21 00:23:01 +02:00
Nat Goodspeed 106bac8ed7 Alphabetize cmd_line.xml.
This separate commit is just to order the keys. Data are unchanged, as
established by:
$ hg cat -rtip cmd_line.xml >cmd_line.xml.tip
$ python
Python 2.7.1 (r271:86832, Jul 31 2011, 19:30:53)
[GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> from llbase import llsd
>>> tipdata = llsd.parse(open("cmd_line.xml.tip").read())
>>> newdata = llsd.parse(open("cmd_line.xml").read())
>>> tipdata == newdata
True
2012-03-05 21:21:29 -05:00
Aaron Stone 42daa3497b STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group. 2011-07-12 15:48:02 -07:00
Richard Linden 5aa43e4f3e SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.)
converted settings_file.xml to use param block descriptions for easier modification
added session settings file and user session settings file for per-session config overrides
2011-02-22 19:30:50 -08:00
Richard Linden cf6147f7c0 EXP-465 FIX Viewer window does not fill screen on Mac and Linux using --fullscreen
disabled fullscreen mode for merge to viewer-development
2010-12-08 17:28:27 -08:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Mark Palange (Mani) 6802775bc4 Merge with viewer-development 2010-11-18 15:36:11 -08:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00