summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
AgeCommit message (Collapse)Author
2010-08-25mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-19Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and ↵Aimee Linden
LLPanelPlace Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-07-19Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and ↵Aimee Linden
LLPanelPlace Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-08Merge with viewer-experimentalDave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicAimee Linden
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-18EXT-7337 WIP Implemented prototype voice font preview floater.Aimee Linden
2010-04-14slightly hairy merge from viewer-trunkTofu Linden
2010-04-13Completed normal subtask EXT-6621 (Code cleanup: Remove unused ↵Mike Antipov
LLFloaterActiveSpeakers and related classes from viewer) * Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo. * Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt). * Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove). * Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions. * Also removed old textures related to removed xml and unused in 2.0 anymore. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/ --HG-- branch : product-engine
2010-03-05merge from viewer-2-0Tofu Linden
2010-03-04Fixed major bug EXT-5943 - Classifieds are Published and charged as soon as ↵Dmitry Zaporozhan
you hit Save. Added Publish Classified floater to confirm classified creashion and publishing. --HG-- branch : product-engine
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