summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-11-23Merge to tipcallum
2009-11-23Fix for DEV-42997 404s result in blank pagecallum
Also needs a tweak to LLQtWebKit that stops navigation to 404 URL specified in code if the URL is empty.
2009-11-23Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-23DEV-42967: Fix prefs panel to not clobber changes to prefs made by other UIRick Pasetto
The prefs floater was unilaterally reverting any changes made by other UI. This fixes that by making squirreling away the current settings an explicit operation, and cancel now happens explicitly on close(), but only if a flag is not set (as is what happens when you hit OK). Reviewed by James.
2009-11-20Fix for DEV-43040 (Change media focus rules to be the same as alt-zoom).Monroe Linden
Added an optional reset_camera parameter to LLPanelPrimMediaControls ::resetZoomLevel(). Default is true, but if false it prevents the reset from moving the camera, and just resets the internal state for zoom tracking. Fixed zoom-related bugs in LLPanelPrimMediaControls::close() and LLPanelPrimMediaControls::onClickZoom(). Changed the zooming behavior in LLViewerMediaFocus to match the desired behavior.
2009-11-20Change to fix DEV-43230 (Japanese input methods don't work with the web ↵Monroe Linden
browser plugin on the Mac.) Inside LLWindowMacOSX::allowLanguageTextInput(), tell the Text Services Manager to put up its own UI for input methods if language text input is being disallowed. This means that the non-inline UI will come up when when entering text in a browser plugin instance with an interactive text input method selected.
2009-11-20MergeSteve Bennetts
2009-11-20MergeSteve Bennetts
--HG-- branch : product-engine
2009-11-20MergeSteve Bennetts
2009-11-20mergeSteve Bennetts
2009-11-20mergeRamzi Linden
2009-11-20- Changed the EN links used for the KnowledgeBase to its new home on the sl ↵Ramzi Linden
wiki. - DEV-43134 Insert localized hyperlinks for all places in XUI where viewer jumps to the web. (This will be needed for Phase 4 Testing of QAR-1355)
2009-11-20Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-20Add log warning if media cap is missingRick Pasetto
2009-11-20Hopefully, really fix DEV-42093.Monroe Linden
2009-11-20mergeJames Cook
2009-11-20Merge from product-engineSteve Bennetts
2009-11-20EXT-1743 People inspectors should show Age, not Date bornJames Cook
2009-11-20Clean up some loggingRick Pasetto
2009-11-20Use "Select/Close" as button labels for avatar picker if choosing people ↵James Cook
repeatedly. Used by group member invitations, for example, where the "OK/Cancel" labels don't make much sense. Reviewed with Richard.
2009-11-20Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-20DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media ↵Rick Pasetto
data overwriting. I think the problem is that this floater's state is not updated properly when the server response comes in. This needs more thought.
2009-11-20Delete the media impl instead of just unloading it. From Review #41 feedback.Rick Pasetto
2009-11-20merging heads again >:(Tofu Linden
2009-11-20Fix for errors with integration tests failing to find libcrypto.so.0.9.7brad kittenbrink
2009-11-20MergeMark Palange (Mani)
2009-11-20Fix broken group "Invite" button from Erica's changes yesterday.James Cook
2009-11-20Merging heads, hmm.Tofu Linden
2009-11-20MergeMark Palange (Mani)
--HG-- branch : product-engine
2009-11-20DEV-42556 Viewer Preference for Parcel media cannot be enabled/disabledskolb
2009-11-20Added two more procedurally created dirs to .hgignore to reduce the clutter ↵Mark Palange (Mani)
of an hg status
2009-11-20Fix main loop to llerrs on memory alloc failure, was masked by misuse of ↵James Cook
LLFLoaterReg with LLFloaterMemLeak. Reviewed with Bao
2009-11-20Implemented low task EXT-1153(FlatListView should support keyboard)Eugene Mutavchi
--HG-- branch : product-engine
2009-11-20Remove unused date code after review with Leyla. Will unbreak Mac build.James Cook
2009-11-20EXT-2618 Added code to determine if the viewer is running 'compatibility mode'Mark Palange (Mani)
OS version string reports compatibility mode and real os version number, if accessible. reviewed by Richard
2009-11-20mergeJames Cook
2009-11-20Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-20mergeJames Cook
2009-11-20Build fix.Sergei Litovchuk
--HG-- branch : product-engine
2009-11-20mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-20Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-20implemented low task (EXT-1476) Make layouts for Alert, Tip and Script ↵Dmitry Oleshko
notifications based on XML - made XML-files for the following controls on the panel for alert toasts: button, check box, icon and line editor. - changed creation of these controls in code: from XML vs. from Params in run-time - added getFont method to the LLCheckBox control --HG-- branch : product-engine
2009-11-20No ticket. Code to resize bottom tray is refuctored after the latest fix for ↵Mike Antipov
EXT-2616: - Removed unused param while extending bottom tray - Moved some debug messages --HG-- branch : product-engine
2009-11-20Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when ↵Mike Antipov
width of window is 800px) - updated resize behavior to shrink Snapshot button: only speaker is shown in this case. - updated LLSpeakButton to hide/show its labels - updated talk_button widget (talk_button.xml) to have correct follows attributes - also fixed bug with calculating necessary updates for children while extending bottom tray --HG-- branch : product-engine
2009-11-20implemented task EXT-1900 Add options to Gestures gear menuDenis Serdjuk
--HG-- branch : product-engine
2009-11-20removed redundant local variableAlexei Arabadji
--HG-- branch : product-engine
2009-11-20fixed EXT-2457 "Remove unresolved notifications counter from the ↵Alexei Arabadji
Login/Startup toast"; --HG-- branch : product-engine
2009-11-20mergeangela
2009-11-19Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-11-19Group profile - widen lists and optimise for sidepanel EXT-2676Erica