7bfa11ed69
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-23 10:08:53 -08:00
a1dd97507c
DEV-42967: Fix prefs panel to not clobber changes to prefs made by other UI
...
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-23 10:08:35 -08:00
1b07c1d7fb
Fix for DEV-43040 (Change media focus rules to be the same as alt-zoom).
...
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-20 17:49:52 -08:00
8f451be20e
Change to fix DEV-43230 (Japanese input methods don't work with the web 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-20 17:12:46 -08:00
8ea25d130d
Merge
2009-11-20 17:39:28 -08:00
017b989de4
Merge
...
--HG--
branch : product-engine
2009-11-20 17:38:42 -08:00
92d725a10e
Merge
2009-11-20 17:23:42 -08:00
90b72b1c71
merge
2009-11-20 17:19:27 -08:00
3ea3f52aed
merge
2009-11-20 17:18:46 -08:00
1d5775a23f
- Changed the EN links used for the KnowledgeBase to its new home on the sl 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-20 17:16:26 -08:00
1d9d099baa
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 16:26:55 -08:00
daef055db9
Add log warning if media cap is missing
2009-11-20 16:26:43 -08:00
20bcd7efeb
Hopefully, really fix DEV-42093.
2009-11-20 15:07:48 -08:00
cbbb107d1f
merge
2009-11-20 14:45:51 -08:00
0bdf520f4f
Merge from product-engine
2009-11-20 14:43:58 -08:00
67c832d94b
EXT-1743 People inspectors should show Age, not Date born
2009-11-20 14:39:46 -08:00
3bb86f91bc
Clean up some logging
2009-11-20 14:01:49 -08:00
ad02019d71
Use "Select/Close" as button labels for avatar picker if choosing people repeatedly.
...
Used by group member invitations, for example, where the "OK/Cancel" labels don't
make much sense. Reviewed with Richard.
2009-11-20 13:27:17 -08:00
95ca60cafe
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 13:12:50 -08:00
766af6102e
DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media 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-20 13:11:39 -08:00
1c57d96aa7
Delete the media impl instead of just unloading it. From Review #41 feedback.
2009-11-20 13:09:39 -08:00
fa43b6ca0b
merging heads again >:(
2009-11-20 20:39:50 +00:00
dd3c7a1a25
Fix for errors with integration tests failing to find libcrypto.so.0.9.7
2009-11-20 15:35:19 -05:00
555c1203ef
Merge
2009-11-20 12:30:17 -08:00
f4913d55b0
Fix broken group "Invite" button from Erica's changes yesterday.
2009-11-20 12:24:37 -08:00
9f00a7f381
Merging heads, hmm.
2009-11-20 20:03:51 +00:00
280a321867
Merge
...
--HG--
branch : product-engine
2009-11-20 11:40:11 -08:00
f80b5ea361
DEV-42556 Viewer Preference for Parcel media cannot be enabled/disabled
2009-11-20 11:36:18 -08:00
172cba3c42
Added two more procedurally created dirs to .hgignore to reduce the clutter of an hg status
2009-11-20 11:21:24 -08:00
75138ddfb2
Fix main loop to llerrs on memory alloc failure, was masked by misuse of LLFLoaterReg with LLFloaterMemLeak.
...
Reviewed with Bao
2009-11-20 10:46:58 -08:00
c9101f603a
Implemented low task EXT-1153(FlatListView should support keyboard)
...
--HG--
branch : product-engine
2009-11-20 20:27:53 +02:00
c4298c4f37
Remove unused date code after review with Leyla. Will unbreak Mac build.
2009-11-20 10:25:02 -08:00
6016ac6588
EXT-2618 Added code to determine if the viewer is running 'compatibility mode'
...
OS version string reports compatibility mode and real os version number, if accessible.
reviewed by Richard
2009-11-20 10:09:22 -08:00
fc04d5bbb8
merge
2009-11-20 09:46:23 -08:00
8bde51b92f
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 09:44:58 -08:00
644ee3f5de
merge
2009-11-20 09:41:14 -08:00
0c468557b9
Build fix.
...
--HG--
branch : product-engine
2009-11-20 18:20:41 +02:00
d1ebc5f44d
merge
...
--HG--
branch : product-engine
2009-11-20 17:44:53 +02:00
7467c005ed
Merge from default branch
...
--HG--
branch : product-engine
2009-11-20 17:41:03 +02:00
2d9202cb81
implemented low task (EXT-1476) Make layouts for Alert, Tip and Script 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-20 16:28:52 +02:00
0876df6eef
No ticket. Code to resize bottom tray is refuctored after the latest fix for EXT-2616:
...
- Removed unused param while extending bottom tray
- Moved some debug messages
--HG--
branch : product-engine
2009-11-20 14:55:30 +02:00
91fdbd92c8
Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when 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-20 14:39:27 +02:00
8dd743e783
implemented task EXT-1900 Add options to Gestures gear menu
...
--HG--
branch : product-engine
2009-11-20 13:53:23 +02:00
a995c494d4
removed redundant local variable
...
--HG--
branch : product-engine
2009-11-20 12:52:40 +02:00
ba2e9f4495
fixed EXT-2457 "Remove unresolved notifications counter from the Login/Startup toast";
...
--HG--
branch : product-engine
2009-11-20 12:19:29 +02:00
a333e03939
merge
2009-11-20 10:53:15 +08:00
aa82dd6e9c
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-11-19 18:39:49 -08:00
f6b718b6af
Group profile - widen lists and optimise for sidepanel EXT-2676
2009-11-19 18:39:11 -08:00
a8b603f33e
Push the policy that "back", "forward" and "stop" do different things out of LLViewerMedia.
...
Now, LLViewerMedia has explicit skipBack() and skipForward()
functions, and the buttons in LLPanelPrimMediaControls now map
onto those functions neatly.
2009-11-19 18:34:37 -08:00
d670d84147
merge
2009-11-20 09:55:19 +08:00
Rick Pasetto