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

72 Commits (cbff0e7ab8afeebb6ddab854d35ea12ef9a9930a)

Author SHA1 Message Date
Richard Linden e6dc88241b MAINT-1474 FIXED World map tracking ring renders in incorrect position with UI scale != 1 2012-08-23 17:07:03 -07:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Jonathan Yap 3b2511661e STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy 
With help from Aleric Inglewood
 2012-01-27 08:33:26 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Siana Gearz 7e0444cbe7 STORM-1678: Correct map display when For Sale is enabled 2011-11-02 11:59:33 -07:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Richard Linden fa3f4d1166 EXP-880 FIX Enable navigation chrome for Search floater 
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
 2011-07-12 20:58:30 -07:00
callum b286a9091b SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile 
Also fixes SOCIAL-521 and SOCIAL-428
 2011-03-25 13:56:14 -07:00
Merov Linden 9652de51ce STORM-281 : merge to viewer-development + fix indentation 2010-10-20 20:13:47 -07:00
Merov Linden e44b548704 STORM-281 : Fix Map FOV frustum when UI size not equal to 1 2010-10-19 17:48:35 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Eugene Mutavchi b36539f23f Fixed normal EXT-6853 ([HARDCODE] Number of "Person"/ "People" in World Map - hard coded?) - added 2 UI strings: "world_map_person" and "world_map_people". 
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/290/

--HG--
branch : product-engine
 2010-04-21 20:05:45 +03:00
Richard Nelson 04332ede42 EXT-6307 - World Map: field of view triangle rotates 
reviewed by monroe
 2010-04-14 17:57:28 -07:00
Richard Linden 09add95e31 EXT-6307 World Map: field of view triangle rotates 
reviewed by Leyla
 2010-04-01 13:42:42 -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
Kent Quirk a3a4235a89 EXT-6321 -- clicking on an event in the main map now invokes the event details floater instead of trying to do a search for the event. 2010-03-18 09:22:34 -04:00
Sergei Litovchuk ae2cbf2df8 Fix for critical task (EXT-4710) Update maturity icons for World Map. 
- Updated maturity icons in map overlay.

--HG--
branch : product-engine
 2010-02-08 17:45:52 +02:00
Tofu Linden 3e8e3b85d9 DEV-44607 ugly/broken font used for region labels in world map view 2009-12-22 16:47:50 -08:00
Kent Quirk f496c2b164 DEV-43622 : API change (no functionality change) to fix a design error in LLSD 
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
 2009-12-01 20:59:08 -05:00
Steve Bennetts 0db73b1ac5 merge 2009-11-06 12:20:52 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Tofu Linden 956ce3af65 M_PI -> F_PI - who knew that M_PI was dropped from C99 onwards?! 
Oh well, this should still be better.
 2009-11-06 16:41:56 +00:00
Tofu Linden 6552c1a973 merge. 2009-11-06 14:58:27 +00: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
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
Steve Bennetts 53c972a521 * Changes to enable differentiating between icon texture priority and other UI texture priority. 
* Still need to only request smaller mip maps of icon textures
 2009-10-25 23:05:15 -07:00
Martin Reddy eb620735fc DEV-41358: Added support for search categories. 
You can now specify a search category for all web-based searches,
e.g., "all" (default), "people", "places", "events", "groups", "wiki",
"destinations", "classifieds". Specifying a category will add the
relevant subdir to the search URL, as specified by the search team.
 2009-10-20 14:07:50 +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
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 2009-10-03 23:40:28 +00:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Richard Nelson 923d84d08f EXT-127: Tooltips don't disappear immediately after moving mouse out of object 
reviewed by Austin
 2009-07-10 20:43:08 +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 9dfe0ca9a0 svn merge -r121194:121210 
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
 2009-05-22 09:58:47 +00:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 2009-05-04 17:43:26 +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
Dave Simmons 24b26d71ee svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 
Merge latest 1.26 into trunk
 2009-03-20 20:00:47 +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
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
 2009-02-18 21:10:16 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
 2009-02-03 17:56:26 +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 b9b4a4d934 QAR-782 Merge featurettes batch #2 
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
 2008-08-13 19:37:05 +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