summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
AgeCommit message (Collapse)Author
2010-02-17merge from viewer2.Tofu Linden
2010-02-16Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-02-13merge from viewer2. this fucks up davep's optimizations, so I'll backout ↵Tofu Linden
their backout next to restore them. I hope. Sheesh.
2010-02-11converted llfloaternearbymedia to llpanelnearbymediarichard
moved from LLTransientDockableFloater model to popup panel model like volume popup
2010-02-11EXT-5044 substasks: turning the event panel into an event floater.Leyla Farazha
reviewed by Richard.
2010-02-03merge from viewer2.Tofu Linden
2010-02-03fixed EXT-4764 “Forbid connecting to different voice channels at once”,Alexei Arabadji
removed redundant call status notifications: ringing, connected, hang_up, unavailable, answering; --HG-- branch : product-engine
2010-01-29merge from viewer2Tofu Linden
2010-01-29completely got rid of Communicate floater and stuffIgor Borovkov
--HG-- branch : product-engine
2010-01-29got rid of lloverlaybar, llmediaremotectrl, llvoiceremotectrl dependencies, ↵Igor Borovkov
updated cmake list --HG-- branch : product-engine
2010-01-28got rid of llfloaterfriends.h includes for EXT-1196 Stalls on startup in ↵Igor Borovkov
LLPanelFriends::refreshNames --HG-- branch : product-engine
2010-01-28got rid of llimpanel.h includes for EXT-1196 Stalls on startup in ↵Igor Borovkov
LLPanelFriends::refreshNames --HG-- branch : product-engine
2010-01-26Merge from viewer2 trunk.Tofu Linden
2010-01-26fixed EXT-3783 “System messages displayed in nearby chat”,Alexei Arabadji
made voice status messages displayed in pop-out window; --HG-- branch : product-engine
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
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-14Backed out changeset f34a69c2af56Tofu Linden
(this backs-out my backout, now that I'm happy the original merge works okay :))
2010-01-14Backed out changeset d5b761982e63Tofu Linden
This got pushed too early - sorry. Sigh.
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
Minor conflict in llviewerfloaterreg.cpp resolved.
2010-01-13mergerichard
2010-01-13implemented EXT-4001 “Notification Well window interaction”,Alexei Arabadji
made notification that restored from notification well window shows as inspector; --HG-- branch : product-engine
2010-01-11EXT-3444 Volume control slider appears in an odd locationrichard
reviewed by Leyla
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
2009-12-31Merge (viewer-2-0 into gooey)James Cook
2009-12-30Work on task EXT-938 (Get rid of deprecated list controls)Mike Antipov
-- remove unused LLFloaterCall & LLPanelAvatarRow used in it. --HG-- branch : product-engine
2009-12-29EXT-3720 Added Advanced > Set Window Size... for video makingJames Cook
Torley needed this to make tutorial movies. Removed dead code from Preferences. Reviewed by Leyla.
2009-12-19Added a first view script limits floatergabriel
reviewed by Mani
2009-12-08Grabbed more viewer 2 changes that should fix parabuild problemPalmer
2009-12-07Merge of viewer 2 changesPalmer
2009-12-07Manual merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-04mergeJames Cook
2009-12-03Added floater_test_text_editor, hooked up UI tests to login Debug menuJames Cook
Reviewed with Leyla
2009-12-03Work on task EXT-3081 (Separate Message Well on Notifications Well and IM Well)Mike Antipov
Initial commit -- added two floater classes derived from LLSysWellWindow to work with Notification Well & IM Well -- register two floaters in place of previous sys_well (but with the same xml file) -- replace using of LLSysWellWindow with LLNotificationWellWindow in the out code (except of in LLScreenChannel::updateShowToastsState) -- rename member variable in bottom tray used for Notification Well --HG-- branch : product-engine
2009-12-03implemented major task EXT-3092 Disable LLFloaterCall from showing on call ↵Andrew Polunin
establishments --HG-- branch : product-engine
2009-12-01mergeJames Cook
2009-11-30merge.Tofu Linden
2009-11-28Fix build broken by removal of a test floater.James Cook
2009-11-26No ticket. Place "script_floater" in alphabetical order.Mike Antipov
--HG-- branch : product-engine
2009-11-26Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) ↵Mike Antipov
started by Lynx (LLVoiceControlPanel)) -- made Voice Control Panel dockable to speak panel -- move button toggle state processing from the code to xml --HG-- branch : product-engine
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-24merge.Tofu Linden
2009-11-23mergeMike Antipov
--HG-- branch : product-engine
2009-11-23clone tutorial floater for volume pulldown.Tofu Linden
2009-11-23reg and rename.Tofu Linden
2009-11-20Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked ↵Dmitry Zaporozhan
up to LLDialog chiclets. Implemented LLDialog(LLScriptFloater) and Script Chiclets. --HG-- branch : product-engine
2009-11-20Work on normal task EXT-2640 (Create a tabbed IM multifloater)Mike Antipov
- initial commit: added xml file and base implementation of the tabbed IM multifloater --HG-- branch : product-engine
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-12merge.Tofu Linden
2009-11-12DEV-2925: Added a new remote object inspector.Lynx Linden
This is used to display details about objects that may not be in the current scene (the existing object inspector is tied to selection and only works for objects in the scene). The remote inspector lets you see the name and owner of the object. You can also teleport to the object's location, view the location on the map, or mute the object. I've also added more information to the notification you receive when an object sends you an IM via llInstantMessage(). This notification now has an "Inspect" button that brings up the remote object inspector.
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info