summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Collapse)Author
2010-09-27MergeLeyla Farazha
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
change to better / more consistent naming
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
let some LLViews handle shortcut keys if they want. reviewed with ambroff
2010-09-22instead of exposing mutable container in LLInitParam::Multiple, just expose ↵Richard Linden
access functions, begin(), end(), etc. this allows mutation of param block contents, without being able to change number of elements
2010-09-16mergeRichard Linden
2010-09-16MergeLeyla Farazha
2010-09-09MergeRichard Linden
2010-09-09Backed out changeset: 28f52b3d2e3dRichard Linden
2010-09-07Automated merge with http://bitbucket.org/TheShining/viewer-developmentXiaohong Bao
2010-09-07fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) ↵Xiaohong Bao
[secondlife-bin llimage.cpp]
2010-09-03vwr-20945 - make menu bar blue when using a project viewerKent Quirk
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
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-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-13fixed progress view z ordering hacksRichard Nelson
DEV-52665 FIX Inventory and Chat hints shown during login before viewer fully loads on load up screen
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12added remaining hints and fade in/fade out behaviorRichard Linden
2010-08-12first pass at hintsRichard Nelson
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-30optimizations in button renderingRichard Nelson
2010-07-22EXT-8051 FIXED Change cameraCustomizeAvatar calls to use ↵Loren Shih
gAvatarp->isUsingBakedTextures Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-25EXT-8071 FIX Viewer crashes in login screen when moving mousewheel in login ↵Richard Nelson
fields.
2010-06-21merge fix, commenting out code after return trueLeyla Farazha
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-17Merge (and resolve conflict) from q/viewer-releaseKent Quirk
2010-06-17Merged from q/viewer-releaseDessie Linden
2010-06-15removing fullscreen functionalityLeyla Farazha
reviewed by richard cc#212
2010-06-15EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshotRichard Linden
made world view extend to where menu bar would normally be when in mouselook
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with ↵Andrew Dyukov
already existing account settings - The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same. - To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message. - Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse"). Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run. Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/ --HG-- branch : product-engine
2010-06-04merge from viewer-publicTofu Linden
2010-06-03EXT-5808 FIXED Mini-Location panel was added below Navigation BarAndrew Polunin
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class. - Mini-Location panel is turned off by default. - Added top bar context menu option \"Show Mini-Location Panel\". - Mini-Location panel displays the same context menu as top bar. - Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp. - Added declaration of the widget in main_view.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/ --HG-- branch : product-engine
2010-06-01Merge with dessie/viewer-public in prep to land code thereJames Cook
2010-05-28merge from viewer-publicTofu Linden
2010-05-27mergePalmer
2010-05-27Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
Final fixes for: EXT-7209 camera to enter appearance edit mode EXT-7366 change camera to face front of avatar in previews EXT-7213 kill old appearance editor Partial fix for: EXT-7392 alpha mask checkboxes are not hooked up All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin: 425d4e960450 15d04b6464a7 e92ae606de12 adc94512ea9b 24577dbbf7a4 6f28b241eae2 (sorry dessie! :) )
2010-05-27merge from viewer-publicTofu Linden
2010-05-26moved SidebarCameraMovement logic out of special widget to camera setup codeRichard Nelson
2010-05-25EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
First pass - eliminated all references to gFloaterCustomize except those that call saveIfDirty. Haven't compiled, haven't reviewed. Will clean up in further patches and get reviewed before pushing.
2010-05-24mergeRichard Nelson