d04dd66353
Merge
2011-01-22 13:38:27 -08:00
46bd7a520b
Initial port of disabling TP/login/logout progress screens.
...
Bugs: Chat history seems to want to open if login progress screen is disabled.
(BSD)
2011-01-19 13:49:50 -08:00
0586dca369
Merge up part2 to Release 2.4.0 + RLVa . Needs live testing
2011-01-19 12:40:31 -05:00
bb04abd971
RLVa mergeup
2010-11-17 06:19:05 -08: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
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
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
ffc07281ad
SH-358 FIXED LLPipeline::renderBloom crash on Windows
2010-11-04 16:30:59 -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
60758b214e
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
525de55540
Automated merge up from viewer-development
2010-10-21 14:18:29 -04:00
5ee546eb4e
for SH-335: create a debug tool to track of memory availability.
2010-10-14 17:01:39 -06: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
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
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
34a063ae5a
VWR-20715 Double-click teleport
...
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +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
8c32b5fe60
- fixed : LLPipeline::sShowHUDAttachments isn't reset to TRUE when an attachment is worn on an empty RLV_LOCK_REMOVE locked HUD attachment point
...
-> @remattach:top=n (with no current attachment on "top" or any other locked HUD attachments)
-> uncheck "Show HUD Attachments" (allowed because RlvAttachmentLocks::hasLockedHUD() will return FALSE when there are no locked HUDs)
-> attach HUD attachment to top => invisible
- fixed : HUD zoom level should be restricted when a HUD attachment is non-detachable
- fixed : wireframe should be disabled when a HUD attachment is non-detachable
--HG--
branch : RLVa
2010-08-22 18:41:57 +02:00
b6a073c659
Initial commit of RLVa-1.2.0i
...
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
b770415b6a
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
599a9a97b4
trivial: remove some debug code of llpushcallstacks.
2010-06-16 16:47:56 -06:00
aa96a6a4e8
EXT-7760: FIXED: only 10 avatars render non-impostored
2010-06-10 12:51:25 -06:00
ac17ec0c28
Merge pull from dessie/viewer-public
2010-05-19 15:58:56 -07:00
b325f72f7d
merge from viewer-public
2010-05-14 09:28:08 +01:00
c0a78f9106
EXT-7155: FIXED: bumpmaps failed to load
...
reviewed by davep.
2010-05-13 14:40:48 -06:00
4a3222d9c1
Fix for fullbright bump not working in deferred render.
...
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
(transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-05-12 03:59:01 -05:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
b7a3582374
merge from viewer-trunk
2010-05-01 15:52:13 +01:00
bb01c04624
trival: remove extra llpushcallstacks, which is for debug only.
2010-04-30 12:56:44 -06:00
9e51aa3fd6
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
58d76a9ecf
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
94e6e10739
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
46fe5d49ca
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
cc4a9b5640
EXT-2959 : Pull out camera functions from llagent to llagentcamera
...
#2 checkin.
Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-24 16:12:01 -04:00
Liny