| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
 | 
 | 
links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
- 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
 | 
 | 
reviewed by monroe
 | 
 | 
reviewed by Leyla
 | 
 | 
 | 
 | 
First check-in; only compiles, nothing more.
 | 
 | 
details floater instead of trying to do a search for the event.
 | 
 | 
- Updated maturity icons in map overlay.
--HG--
branch : product-engine
 | 
 | 
 | 
 | 
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.
 | 
 | 
 | 
 | 
 | 
 | 
Oh well, this should still be better.
 | 
 | 
 | 
 | 
--HG--
branch : texture-pipeline
 | 
 | 
 | 
 | 
 | 
 | 
UI texture priority.
* Still need to only request smaller mip maps of icon textures
 | 
 | 
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.
 | 
 | 
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.
 | 
 | 
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
 | 
 | 
Self reviewed.
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
 | 
 | 
 | 
 | 
reviewed by Austin
 | 
 | 
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
 | 
 | 
ignore-dead-branch
 | 
 | 
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
 | 
 | 
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
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
 | 
 | 
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.
 | 
 | 
(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
 | 
 | 
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
 | 
 | 
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
 | 
 | 
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
 | 
 | 
dataserver-is-deprecated
 | 
 | 
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches.  Future work will be in featurettes.
 | 
 | 
dataserver-is-deprecated
 | 
 | 
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
 | 
 | 
QAR-424
 |