summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-21mergeRick Pasetto
2010-01-21EXT-4266 Can't "drop" object selected in select-face modeLeyla Farazha
reviewed by Callum
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-20got rid of win CRIgor Borovkov
--HG-- branch : product-engine
2010-01-20more on LLFloaterChat - oops...commit code with errorYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-20more on removing LLFloaterChatYchebotarev ProductEngine
there was some places with messages that (as I think) should not go to nearby chat. but still probably should go somewhere... code is commented and messages are marked with: //TODO* CHAT: how to show this? --HG-- branch : product-engine
2010-01-19mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-18Refactored fix for (EXT-4156) [BSI] Friendslist doesn't toggle open/close on ↵Sergei Litovchuk
shortcut - Moved side panel toggling from viewer menu to side tray class. --HG-- branch : product-engine
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
leave some LLFloaterChat usages commented for later review... --HG-- branch : product-engine
2010-01-18Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2010-01-15Fixed normal bug (EXT-4156) [BSI] Friendslist doesn't toggle open/close on ↵Sergei Litovchuk
shortcut - Added toggling for friends, groups and nearby people lists. --HG-- branch : product-engine
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-13Merge.Tofu Linden
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-06MergeLeyla Farazha
2010-01-06menu holder, tooltip view and snapshot floater should be in main_view as ↵Leyla Farazha
added in main_view.xml reviewed by richard
2010-01-06Merge from viewer2 trunk again - some fairly important fixes there.Tofu Linden
2010-01-06mergerichard
2010-01-05MergeLeyla Farazha
2010-01-05EXT-3721 SNAPSHOT PREVIEW can be dragged over the top menusLeyla Farazha
reviewed by Richard
2010-01-05EXT-3806 Attachment drop confirmation popup: "No" is ignoredJames Cook
Missing an if (option != 0) Made callback function return void as result is not used.
2010-01-05DEV-44767 lookat stays locked on object/avatar after 'esc' camera resetTofu Linden
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2010-01-04MergeLeyla Farazha
2010-01-04moving this menu item to the right placeLeyla Farazha
EXT-3388 [BSI] "Teleport" option missing dropdown when right clicking on friends list
2010-01-04EXT-2481 [BSI] Add "Zoom in" to 3D Object context menu and inspector Gear menuLeyla Farazha
EXT-3388 [BSI] "Teleport" option missing dropdown when right clicking on friends list
2009-12-26Reduced header dependency from the "llimview.h"Mike Antipov
--HG-- branch : product-engine
2009-12-23EXT-3532 Can't deactivate "Render Attached Lights" and "Render Attached ↵Tofu Linden
Particles"
2009-12-23For EXT-3622: Take off item, wear a different item --> first item is put on ↵Brad Payne (Vir Linden)
again. Fixed the 'remove all clothing' case.
2009-12-22For EXT-3622: Take off item, wear a different item --> first item is put on ↵Brad Payne (Vir Linden)
again
2009-12-18Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2009-12-18merging latest PE changes into viewer-2-0Nyx (Neal Orman)
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-18Merge, pulling in viewer-2-0James Cook
2009-12-18Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-17EXT-3557 : CTRL+I should bring up either InventorySP or InventoryFloaterLoren Shih
Hitting CTRL+I when InventorySP is open will now bring up InventoryFloaters.
2009-12-18Fixed normal bug EXT-637 (Please, add tooltips with a full names of the ↵Sergey Borushevsky
landmraks in the Favor bar / Overflow menu) Fixed problem with overlapping of tool tip by menu. --HG-- branch : product-engine
2009-12-17automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-16MergeJames Cook
2009-12-16EXT-2435 : Advanced > Shortcuts > Fly is always tickedLoren Shih
Simple UI change to read gAgent.getFlying state. --HG-- branch : avatar-pipeline
2009-12-16mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-16For EXT-3114: [BSI] Can't right click > edit a no-mod attachmentBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-15MergeJames Cook
2009-12-15EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time optionsLeyla Farazha
EXT-2649 [BSI] Confirm on Drop EXT-3416 Can't name a new gesture on creation (and renaming is HARD) reviewed by James
2009-12-15automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-15EXT-3494 Sanitize floater show versus toggleJames Cook
Eliminated legacy "ShowFloater" method in favor of Floater.Show and Floater.Toggle. Wrote new custom show methods where needed. Reviewed with Leyla.
2009-12-15EXT-3199 : Re-enable task inspection inventory sidepanelLoren Shih
Re-enabled right click menu option for bringing up this sidepanel. --HG-- branch : avatar-pipeline
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-11Merge, fixed conflict in panel_preferences_sound.xmlJames Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:08:59 +0000