a7e724e6c6
Less intrustive code for legacy cursor support
2011-01-18 17:27:11 -08:00
80e2a367a3
Added support for legacy cursors
2011-01-15 20:07:08 -08:00
9b7d3053dc
Fixing ctrl-alt-shift-h to print out "hippos!" to your local chat (fixes https://jira.secondlife.com/browse/VWR-11118 again)
2011-01-12 16:22:25 -08:00
e4d1ffaddf
Najor top bar rewiring. Topbars now float over world. Search field toggleable. All bars toggleable.
2010-12-27 00:27:30 -05:00
b184099a5f
Backported LL configuration to allow chat bar to take focus on type due to popular demand.
2010-12-18 20:40:20 -05:00
bb04abd971
RLVa mergeup
2010-11-17 06:19:05 -08:00
a942a64b89
merge fixes for STORM-546
2010-11-09 19:40:58 -05:00
cb54738a49
Merge from beta
2010-11-09 16:31:16 -05:00
dc59b268dc
SH-412 -- fix the way that redraws happen to eliminate flickering on resize -- patch from davep and seraph, I'm just applying it.
2010-11-09 15:18:41 -05:00
caa53cc8cd
merge up from v-d
2010-11-09 10:05:17 +00:00
829b22b1e4
Merge from LL
2010-11-05 12:17:05 -07:00
b96b8e3ca0
Merge with RLva-#head
2010-11-04 10:09:29 -07:00
d0d3e716dc
Rolling back before back RLV merge
2010-11-04 10:02:01 -07:00
cc718fcdf2
Snowstorm syncup
2010-11-03 22:44:26 -07:00
0347844b34
SH-358 FIXED Non-FBO driven fix for anti-aliasing (make applying of FSAA require restart when FBO is disabled).
2010-11-04 16:53:14 -04:00
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
e095665cca
SH-281 Fix for snapshots showing interface all the time
2010-11-01 12:30:54 -05:00
8fcb69d0c3
Integration of RLVa, pre-display names.
...
HUDtext updates may be broken, much testing needed.
I expect this merge to be improved and even fully replaced by up and coming RLVa work.
When we do get a clean merge of RLVa, it should stay clean.
It does compile ;)
2010-10-31 20:47:18 -04:00
9498c31d3c
Merged with default tip (Revision aeb7e6c38341)
...
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
179e9e37ec
merge from viewer-development.
2010-10-27 11:03:39 +01:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
40e9566d98
Non-FBO driven fix for anti-aliasing (make applying of FSAA require restart when FBO is disabled).
2010-10-22 16:49:32 -05:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
ad033a4b35
sync up to viewer-developer
2010-10-15 09:52:11 +01:00
393c819477
VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
...
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
d65e512fa3
Automated merge up from viewer-development
2010-10-04 11:21:18 -04:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
f3b01596dd
VWR-21377 Script editor ctrl-f fix.
...
change to better / more consistent naming
2010-09-24 16:31:43 -07:00
0931799f03
VWR-21377 Script editor ctrl-f fix.
...
let some LLViews handle shortcut keys if they want.
reviewed with ambroff
2010-09-24 15:57:17 -07:00
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
1911993cc7
merge
2010-09-16 19:45:57 -07: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
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
f7ff27e313
Merged with default tip (Revision b8cd74d2bcc8)
...
--HG--
branch : RLVa
2010-09-15 23:22:10 +02:00
6c2c87e8b9
Merge
2010-09-09 17:19:33 -07:00
30f2987b0a
Backed out changeset: 28f52b3d2e3d
2010-09-09 17:17:44 -07:00
a0611b5a01
Automated merge with http://bitbucket.org/TheShining/viewer-development
2010-09-07 13:27:49 -06:00
497d35af48
fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) [secondlife-bin llimage.cpp]
2010-09-07 10:48:06 -06:00
600d60e498
Merged with default tip (Revision c752f2cb29e1)
...
--HG--
branch : RLVa
2010-09-07 01:28:38 +02:00
b2eb877d52
vwr-20945 - make menu bar blue when using a project viewer
2010-09-03 17:37:17 -04: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
e6e551cb41
Merged with default tip (Revision 7a739cbdce56)
...
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07: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
kadah