b6f0921099
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-06 19:02:39 -04:00
b12ade128b
MAINT-1491 Make GPU table more readable, clear out some cruft, and start reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.
2012-08-29 20:49:47 -05:00
9611356556
MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate.
2012-08-28 13:52:14 -05:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07: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
5700ba737d
avatar metrics - cleanup, removed unused fields
2012-06-11 11:00:38 -04:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
cab86a913d
PATH-638: Adding elements to render the new sim stats.
2012-05-18 19:14:43 -07:00
c946408519
MAINT-586 Starting logging OpenGL version and shader level to simulator
2012-05-11 14:42:29 -05:00
7fbf42dec8
Move phase tracking to its own set of classes inside LLViewerStats - simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime
2012-04-19 14:52:44 -04:00
bc3f0e0a81
EXP-1230 FIX As a resident, I want to not have to choose a UI mode
...
removed all references to basic mode
2011-09-20 18:47:13 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
05592975fb
SOCIAL-660 Pass skin value in viewer stats log message
2011-03-10 13:19:58 -08:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
f79615cace
Automated merge up from viewer-development
2010-12-03 14:49:33 -05:00
c51608633d
CHOP-238 Fix to bug introduced by http://hg.secondlife.com/viewer-beta/changeset/4072bd5389b2 Reviewed by Brad
2010-12-01 16:02:43 -08:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
d1c365e7b7
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
2010-11-05 16:45:18 -07:00
6ab2e44e94
VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad.
2010-11-01 15:18:18 -07:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
fcdd09772f
debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23.
2010-09-16 13:13:06 -06:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
10b664833a
adding DisplayNamesEnabled and DisplayNamesShowUsername to the top level of our viewer stats
2010-08-05 16:30:32 -07:00
91c1545f90
Added mesh bytes received to viewer stats.
2010-08-11 17:43:36 -05:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
be299644e3
Merged from viewer-release
2010-07-14 06:39:14 -07:00
b46fff1ba1
Merged from viewer-release
2010-07-14 06:39:14 -07:00
a884f5c0c7
Added AgentPositionSnaps data to ViewerStats to measure frequency and scale of interpolation failures.
2010-07-13 17:16:05 -07:00
3d39634cbd
merge from viewer-public
2010-05-12 11:44:16 +01:00
df07ba176c
merge from viewer-public
2010-05-12 11:44:16 +01:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
Nat Goodspeed