summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-11-03Removed declared but never defined function, which was causing a build ↵Brad Payne (Vir Linden)
failure on Mac --HG-- branch : avatar-pipeline
2009-11-03Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-03Added missing llinventorypanel files from previous checkin.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-03Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-03For EXT-1591: Current Outfit Folder contains duplicate attachment items ↵Brad Payne (Vir Linden)
after relog. --HG-- branch : avatar-pipeline
2009-11-02MainInventory aesthetic fixes.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02Merge commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02Main Inventory Panel layout fixes.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02Merge conflict resolution for previous commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.
2009-11-02Merge of local changes with latest avp changes.Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-02mergeBrad Payne (Vir Linden)
2009-11-02Work in progress on attachment tracking.Brad Payne (Vir Linden)
2009-11-02merging in viewer2 changesEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-02mergeJames Cook
2009-11-02Ignore WinMerge .bak temp files.James Cook
Not reviewed.
2009-11-02Fix unclear function names around Pacific versus "SLT" time in string ↵James Cook
operations. Reviewed with Brad.
2009-11-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-02DEV-40744 EXT-332: include viewer version information in the Buy L$Lynx Linden
requests to the XML-RPC server, including the channel name and the major, minor, patch, and build version numbers. This information is needed by the international billing guys to determine whether an international customer is trying to use a 1.23 viewer to buy L$.
2009-11-02DEV-40702: fixed the audio device enumeration code so that it worksLynx Linden
with Vivox V2 and V3 SDKs. We were assuming that the <CaptureDevice> tag contains only a single tag (<Device>), but the V3 SDK returns other tags such as <DisplayName> and <Type>. I also added the current Vivox SDK version to the About window so that it is easier to tell which version your client is actually using.
2009-11-02Added a newline at the end of llui/lliconctrl.cpp to unbork parabuild.Martin Reddy
2009-11-02DEV-41358: Include the current user's maturity and teen ratings in theMartin Reddy
URL that we send to the Search web page. This can be used to determine the maturity levels to display. These bools are passed as query params in the URL (as agreed upon with the search team).
2009-11-01additional fix for DEV-41913: parcel media does not display on particle ↵Xiaohong Bao
textures.
2009-11-01EXT-2056Erica
2009-10-31Fix font and layout for list items, status bar, people panel tabs, system ↵Erica
well EXT-2055
2009-10-31Convert URLs in notifications and viewer stings to wiki URL format ↵Erica
EXT-1952, Reword Abuse Report notification to reduce wordcount EXT-1953
2009-10-31Add missing eolCG Linden
2009-10-30mergeXiaohong Bao
2009-10-30sync to the tip.Xiaohong Bao
2009-10-30fix DEV-41913: parcel media does not display on particle textures.Xiaohong Bao
2009-10-30mergerichard
2009-10-30forgot to add toolt_tip.xmlrichard
2009-10-30EXT-2053 Add parcel permission icons to place profile, layout to specErica
2009-10-30mergerichard
2009-10-30Another experiment: made the selection in the nearby media floater track the ↵Monroe Linden
media impl the media controls are currently referencing (either focus or hover).
2009-10-30On a double-click in the nearby media list, try to focus/zoom in on the prim ↵Monroe Linden
holding the media.
2009-10-30mergerichard
2009-10-30EXT-2018 PRofile "Real World" descripton scrolls before showing "More" linkrichard
EXT-2011 titles of IM sessions aren't aligned to center EXT-3025 Pick's description overlaps picks name also moved tool tip param default to tool_tip.xml also made default param<const LLFontGL*> be SansSerif reviewed by Leyla
2009-10-30Initial pass at filling in the list in the nearby media floater.Monroe Linden
2009-10-30Add implementation for adding and removing items to and from the nearby ↵Rick Pasetto
media list scroll control
2009-10-30Fix crash in LLMultiFloater::setCanResize()Rick Pasetto
Reviewed (conceptually) by Richard and James
2009-10-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-10-30EXT-2046 Add You are Here and For Sale iconsErica
2009-10-30merge default and avatar-pipeline branches after syncEric M. Tulla (BigPapi)
2009-10-30Partial implementation of LLFloaterNearbyMedia::refreshList(), with many ↵Monroe Linden
TODO sections and a bit of ifdef-ed out pseudocode. Initial pass at LLViewerMediaImpl::getProximity(). Currently it just returns the position in the priority list, but that will change.
2009-10-30Add Inventory Look folder (open / closed) and Generic Object art EXT-2042Erica
2009-10-30Fixed a couple problems with getPriorityList().Monroe Linden
2009-10-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-10-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-10-30mergeJames Cook