Commit Graph

831 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
Oz Linden 981190cf31 merge back beta fixes 2012-08-14 18:41:25 -04:00
Oz Linden 5f1230e911 MAINT-1342: correct initial login location handling, clarify the two related persistent settings 2012-08-09 11:52:48 -07:00
Nat Goodspeed f1ff284569 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-02 13:23:46 -04:00
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Nat Goodspeed e4ee7cbc60 Use [create_account_url] from strings.xml consistently in notifications.xml.
The URL whose simple form is http://join.secondlife.com actually appears in a
number of places in the localized notifications.xml files. It's supposed to be
localized for the current viewer language -- and in strings.xml, it is. But
the same URL is restated a couple times in notifications.xml, sometimes
localized, sometimes not.
Add "create_account_url" to init_default_trans_args(), permitting us to embed
[create_account_url] anywhere in the skin files. Then replace all known
occurrences of that URL in notifications.xml files with [create_account_url].
2012-06-29 14:43:31 -04:00
Dave Parks ed72fd0ae9 merge 2012-06-28 13:22:04 -05:00
Brad Payne (Vir Linden) 74d4f8af01 v-r to drano merge conflicts wip 2012-06-26 16:43:58 -04:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden d7400ae60c merge to pathfinding development branch 2012-06-18 22:23:30 -04:00
Dave Parks a1d0d67e05 MAINT-775 Fix for particle index pool corruption on teleport. 2012-06-15 16:07:06 -05:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Oz Linden 13ca132037 merge changes for DRTVWR-157 2012-06-04 17:07:27 -04:00
Dave Parks 2e26dc3971 Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting. 2012-05-30 13:22:04 -05:00
Xiaohong Bao 957bfcd5d9 fo SH-3074: clear ghost and stale texture fetching requests in time. 2012-05-29 18:02:11 -06:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Oz Linden 1d01ad1162 merge changes for DRTVWR-151 2012-05-24 20:35:25 -04:00
Xiaohong Bao aa44ec81e1 for SH-3118: add a toggle "TextureFetchDebuggerEnabled" to turn the console on and off. 2012-05-01 16:49:28 -06:00
Oz Linden 5d92c60a4a merge changes for storm-1842 2012-05-01 13:26:20 -04:00
Jonathan Yap bea4733193 STORM-1842 Change variable setting from TRUE to true 2012-05-01 12:19:00 -04:00
Xiaohong Bao e344b2afa2 For SH-3121: collect time of reloading all textures from cache and through HTTP when all objects loading are done. 2012-04-26 15:53:35 -06:00
Xiaohong Bao 5ab4dadc70 for subtasks SH-3118, SH-3112, SH-3110, SH-3106, SH-3091 for SH-3086:
As a viewer architect, I would like to understand how fast each of the components of the texture pipeline can run in isolation
2012-04-25 16:59:20 -06:00
Todd Stinson 1cdef4903d Updating to the latest llphysicextensions pre-built package with the now lowercased version of the header file names. 2012-04-18 16:03:33 -07:00
Merov Linden adf5b5c1ef Final pull from viewer-thx1138 2012-04-13 17:20:53 -07:00
Merov Linden 7d8fdf9a85 SH-3080 : Fix wrong settings reading code (will crash on some machine) 2012-04-13 12:09:37 -07:00
Merov Linden 18fa5cd60b Pull from viewer-thx1138 2012-04-13 10:54:31 -07:00
Merov Linden c410a4e332 SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter 2012-04-12 20:19:56 -07:00
Brad Payne (Vir Linden) b4cf5c0c24 merge 2012-04-12 16:02:15 -04:00
Xiaohong Bao 3c0e4e4324 Automated merge with https://hg.lindenlab.com/merov/viewer-thx1138 2012-04-11 16:14:16 -06:00
Zi Ree 2b0318ffd0 STORM-1842 Don't save per-account settings if login not fully successful
Repo created from Firestorm patch by Jonathan Yap
2012-04-10 16:01:46 -04:00
Brad Payne (Vir Linden) af74e5e443 merge viewer-release to runway 2012-04-09 18:11:34 -04:00
Xiaohong Bao 625e76c1e4 For SH-3072: do not pause texture fetching when FPS is low. 2012-04-03 16:02:03 -06:00
Merov Linden df09fd8e8b SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off 2012-04-02 19:05:32 -07:00
Dave Parks a244cff781 MAINT-778, MAINT-793 Fix for crash when enabling Debug GL on Mobile Intel 4 Express. Don't pop up driver update notification if GPU class is < 1 2012-03-30 12:17:34 -05:00
Dave Parks 76634dc7af MAINT-793 Pop up notification when drivers are likely out of date. Allow Lighting and Shadows on Intel when drivers are up to date. 2012-03-28 00:49:42 -05:00
Vadim ProductEngine 7b4d05894d MAINT-141, MAINT-95, MAINT-62 FIXED Don't delete files using masks starting with "/".
Encountering such a mask will show a warning message and throw a debug assertion.
2012-03-19 19:12:03 +02:00
Nat Goodspeed 2a6f919cdb Explicitly clean up all LLLeap instances during viewer shutdown.
This code replaces the previous cleanup of DLLs loaded by APR.
2012-03-15 16:16:05 -04:00
Nat Goodspeed 7de3161fa8 Fix --leap assumption that LeapCommand setting is ALWAYS an array.
Nuance of command-line processing: when there's exactly one --leap switch, the
resulting LLSD is a scalar string rather than an array with one entry. Fix
processing code to handle either case.
2012-03-14 23:59:57 -04:00
Brad Payne (Vir Linden) b4b0800bfd SH-2970 FIX - per-region logging of basic avatar stats 2012-03-14 17:46:44 -04: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
Brad Payne (Vir Linden) a37e121dbf SH-2970 WIP - avatar metrics 2012-03-03 06:59:34 -05:00
Todd Stinson ed60f5b2d5 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-03-01 15:35:13 -08:00
Brad Payne (Vir Linden) 7b3f721e7a SH-3018 WIP - removed audit texture, other unused diagnostic code 2012-02-29 16:15:02 -05:00
Dave Parks 52782548c8 SH-2973 Rearrange shutdown operations to prevent crash on exit on OSX 2012-02-14 17:09:42 -06:00