Richard Linden
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
Dave Parks
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
Oz Linden
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
Loren Shih
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
Leyla Farazha
05592975fb
SOCIAL-660 Pass skin value in viewer stats log message
2011-03-10 13:19:58 -08:00
Don Kjer
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
Loren Shih
f79615cace
Automated merge up from viewer-development
2010-12-03 14:49:33 -05:00
Mark Palange (Mani)
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
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Loren Shih
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
brad kittenbrink
d1c365e7b7
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
2010-11-05 16:45:18 -07:00
Mark Palange (Mani)
6ab2e44e94
VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad.
2010-11-01 15:18:18 -07:00
Loren Shih
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
Loren Shih
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Xiaohong Bao
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
Aimee Linden
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
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
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
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Leyla Farazha
10b664833a
adding DisplayNamesEnabled and DisplayNamesShowUsername to the top level of our viewer stats
2010-08-05 16:30:32 -07:00
Dave Parks
91c1545f90
Added mesh bytes received to viewer stats.
2010-08-11 17:43:36 -05:00
Richard Linden
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
Dessie Linden
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
Dessie Linden
be299644e3
Merged from viewer-release
2010-07-14 06:39:14 -07:00
Dessie Linden
b46fff1ba1
Merged from viewer-release
2010-07-14 06:39:14 -07:00
Matthew Breindel (Falcon)
a884f5c0c7
Added AgentPositionSnaps data to ViewerStats to measure frequency and scale of interpolation failures.
2010-07-13 17:16:05 -07:00
Tofu Linden
3d39634cbd
merge from viewer-public
2010-05-12 11:44:16 +01:00
Tofu Linden
df07ba176c
merge from viewer-public
2010-05-12 11:44:16 +01:00
Roxie Linden
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
Tofu Linden
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
Roxie Linden
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
Loren Shih
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
Loren Shih
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
Roxie Linden
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
Palmer Truelson
fd749ea7d5
EXT-6419 Adding comma to viewer stats texture time output
2010-03-17 14:23:40 -07:00
Palmer Truelson
e898ec97a2
EXT-6419 : Adding texture time metric to viewer stats
...
Reviewed by Mani
2010-03-17 12:20:57 -07:00
Dave Parks
fb830551d0
Tweak detail settings and make graphics preferences widget enabling respect requirements.
2010-03-20 16:56:36 -05:00
Dave Parks
b767f2a5d5
Tweak detail settings and make graphics preferences widget enabling respect requirements.
2010-03-20 16:56:36 -05:00
Steve Bennetts
06019288c1
HTTP Texture tuning:
...
* Changed download rate update frequency
* Updated network bandwidth preferences to be 100 Kbps - 10 Mbps instead of 50 Kbps - 1.5 MBps
2009-12-18 17:14:53 -08:00
brad kittenbrink
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00
James Cook
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
Xiaohong Bao
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
Martin Reddy
6c1706da69
DEV-41358: Remove the code for the old search interface.
...
This checkin deletes all of the code associated with the old XUI-based
search interface, including LLFloaterDirectory, LLPanelDir*, a global
variable event hack, and the associated XUI file. The new web-based
search interface, LLFloaterSearch, is the way of the future.
Deleted 19 files and 5,838 lines of code.
2009-10-19 13:35:10 +00:00
Monroe Williams
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Richard Nelson
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Xiaohong Bao
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
Roxie Linden
fe71dd340a
Merge giab-viewer-trunk 2497, general merge of more
...
secapi stuff as well as certificate handling stuff.
Grid manager as well
2010-02-01 15:10:19 -08:00