d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
4a3bdb6896
Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.
2012-10-10 15:10:48 -07:00
827d8814cf
MAINT-1688 Potential fix for crash on exit in LLTextureFetch
2012-10-09 13:34:28 -05:00
374f20edf0
Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown
2012-10-03 14:30:21 -05:00
05dbd7dafe
Instrument debug builds on windows to help track down source of heap corruption
2012-10-02 16:06:14 -05:00
7fc702dc49
reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport.
2012-09-20 10:00:58 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
d48889198b
MAINT-1486 FIX Crash on login (Unhandled exception)
...
open root timer by default
2012-08-30 19:23:17 -07:00
93578f7e51
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
2012-08-24 16:31:29 -07:00
97106c2dea
merge changes for DRTVWR-194
2012-08-15 17:07:10 -04:00
981190cf31
merge back beta fixes
2012-08-14 18:41:25 -04:00
5f1230e911
MAINT-1342: correct initial login location handling, clarify the two related persistent settings
2012-08-09 11:52:48 -07:00
a98c7e150b
llfasttimer cleanup
...
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
2012-08-06 16:08:04 -07:00
f1ff284569
Automated merge with http://hg.secondlife.com/viewer-development
2012-08-02 13:23:46 -04:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
df7d6c9075
SH-3275 WIP Run viewer metrics for object update messages
...
continued clean up of llstats stuff
2012-07-18 12:37:52 -07:00
5d32e23a11
SH-3275 WIP Run viewer metrics for object update messages
...
improved update logging API and output format
2012-07-12 22:35:51 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
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
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
ed72fd0ae9
merge
2012-06-28 13:22:04 -05:00
74d4f8af01
v-r to drano merge conflicts wip
2012-06-26 16:43:58 -04:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
d7400ae60c
merge to pathfinding development branch
2012-06-18 22:23:30 -04:00
a1d0d67e05
MAINT-775 Fix for particle index pool corruption on teleport.
2012-06-15 16:07:06 -05:00
d500379cea
PATH-735: Limit and clean up grid selection
2012-06-12 21:58:52 -04:00
13ca132037
merge changes for DRTVWR-157
2012-06-04 17:07:27 -04:00
2e26dc3971
Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting.
2012-05-30 13:22:04 -05:00
957bfcd5d9
fo SH-3074: clear ghost and stale texture fetching requests in time.
2012-05-29 18:02:11 -06:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
1d01ad1162
merge changes for DRTVWR-151
2012-05-24 20:35:25 -04:00
aa44ec81e1
for SH-3118: add a toggle "TextureFetchDebuggerEnabled" to turn the console on and off.
2012-05-01 16:49:28 -06:00
5d92c60a4a
merge changes for storm-1842
2012-05-01 13:26:20 -04:00
bea4733193
STORM-1842 Change variable setting from TRUE to true
2012-05-01 12:19:00 -04:00
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
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
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
adf5b5c1ef
Final pull from viewer-thx1138
2012-04-13 17:20:53 -07:00
7d8fdf9a85
SH-3080 : Fix wrong settings reading code (will crash on some machine)
2012-04-13 12:09:37 -07:00
18fa5cd60b
Pull from viewer-thx1138
2012-04-13 10:54:31 -07:00
c410a4e332
SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter
2012-04-12 20:19:56 -07:00
simon@Simon-PC.lindenlab.com