livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,105 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

52 Commits (8243d30f02abd56dc2abdc1925f16ccf81fbbb49)

Author SHA1 Message Date
Tank_Master cb24ec2e0d merge LL 3.3.4 beta 
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
 2012-07-16 21:59:14 -07:00
Jonathan Yap f58cfdac22 STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached 2012-06-01 16:01:40 -04:00
Ansariel f36b769e5e Fix for avatar tracker not stopping when avatar comes in reach (VWR-29048) from Jonathan Yap 2012-06-01 13:48:24 +02:00
Ansariel 7146c57d90 Added option to disable stopping of avatar tracker when reaching avatar (FIRE-6468) 2012-05-31 21:04:18 +02:00
Nicky adf6ca947e Merge up to 26121/6a223218718e; latest RLVa from catznip-3.2.0 (http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0). 2012-01-23 17:09:53 +01:00
Nicky 1714747536 After merge compare FS tree agsindt V/dev. 
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
 2012-01-18 19:04:59 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
 2012-01-17 17:57:52 +01:00
Kitty Barnett 2ae2d34bdb Merged with default tip (Revision 9e390d76807f) 
--HG--
branch : RLVa
 2011-11-07 16:11:42 +01:00
Dave Parks e2b52009ea merge 2011-10-24 15:32:58 -05:00
Leyla Farazha 11bad6f75c EXP-1352 Red directional arrow shown on teleport screen when selecting a destination from the destinations floater to teleport to 2011-10-19 13:43:27 -07:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Dave Parks 2ee8154780 SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). 2011-08-10 13:01:14 -05:00
Kitty Barnett 604345b918 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-02-19 01:12:23 +01:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86) 
--HG--
branch : RLVa
 2010-10-30 17:28:00 +02:00
Ansariel 64d7e49455 Tweakage to tracker beam rendering 2011-12-22 19:58:44 +01:00
Tank_Master 1344701246 Backported from Viewer-Dev (14025 (e25b014dbce3) & 14026 (7fd55487ce03) EXP-250 FIX Option to disable beacons) 2011-02-11 16:07:45 -08:00
Richard Linden 548f2e92ff EXP-250 FIX Option to disable beacons 
hud arrow also controlled by RenderTrackerBeacon setting
 2010-10-18 17:34:30 -07:00
Richard Linden 97101982de EXP-250 FIX Option to disable beacons 2010-10-18 17:24:49 -07: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
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i 
--HG--
branch : RLVa
 2010-08-22 10:57:22 +02:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines 
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
 2010-04-05 15:02:36 -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
James Cook 36c35bca26 Support multiple fonts, colors and styles in name tags 
Simplified LLHUDText string API to be UTF8 only
Added per-text segment font support
Changed LLVOAvatar invalidateNameTag to clearNameTag
 2010-02-25 17:06:17 -08:00
Loren Shih acdce23299 Header file cleanup 
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
 2009-11-13 17:47:00 -05:00
Tofu Linden 904f6124b2 magic number removal rampage: 3.14159 -> M_PI or F_PI 
--HG--
branch : texture-pipeline
 2009-11-06 13:27:28 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
 2009-07-06 21:58:04 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge 
Melinda (coco): 5th and final batch of featurettes. My work here is done.
 2009-03-13 21:28:40 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake) 
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
 2008-06-06 22:43:38 +00:00
Don Kjer 3855896097 EFFECTIVE MERGES: 
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated
 2008-05-19 17:02:33 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge 
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
 2008-05-08 18:41:20 +00:00
Brian McGroarty d273ba2ce2 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
Brian McGroarty e1e1212daa QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated 2008-05-07 17:17:42 +00:00
Steven Bennetts a3f3ab7e11 QAR-449 Viewer 1.20 RC 1 
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
 2008-04-17 02:56:14 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
 2008-03-04 16:59:57 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in 
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
 2008-02-27 18:58:14 +00:00
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
 2007-12-05 23:43:56 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Josh Bell b3d807d5ff svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
 2007-09-13 18:17:52 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00
Steven Bennetts d1582a5105 merge -r 57111:57464 maintenance. 2007-02-05 20:20:42 +00:00