summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Monroe Linden
2010-02-05Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in ↵Monroe Linden
the key data. Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data. Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data. Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask". The Qt (non-native) modifiers should be good enough.
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Mark Palange (Mani)
2010-02-05EXT-4754 Fix for LLEventTimer::updateClass crash.Mark Palange (Mani)
Ugh. Update on Tofu's patch for this bug. Reviewed by Richard
2010-02-05Test: reverting to well-formed xmlEli Linden
2010-02-05test ill-formed xmlEli Linden
2010-02-05MergeLeyla Farazha
2010-02-05EXT-4102 [BSI] auto zoom on media prims push camera away when zoomed in ↵Leyla Farazha
and clicking reviewed by Rick
2010-02-05EXT-4252 Streaming Audio lost after TPLeyla Farazha
reviewed by Rick
2010-02-05Fix for EXT-4943 (Text editor is broken).Monroe Linden
Reviewed by Richard.
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-05Cleaned up "My Profile" side-panels.Chuck Linden
https://jira.secondlife.com/browse/EXT-4335
2010-02-05mergerichard
2010-02-05EXT-5026 - Crash when exiting from login screenrichard
reviewed by Mani
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-02-05EXT-5034 assert triggered for new avatars in LLVOAvatar::restoreMeshData()Nyx (Neal Orman)
We had commented out the word "virtual" in front of the function definition for some reason. one-liner, reviewed by Bigpapi.
2010-02-05line ending conversionrichard
2010-02-05newlines fixedrichard
2010-02-05mergerichard
2010-02-05mergeMark Palange (Mani)
2010-02-05mergerichard
2010-02-05EXT-4232 Keeping gSpashScreen up until the viewer window appears.Mark Palange (Mani)
Move the call to LLSpashScreen::hide() to the point where we show the main window. Reviewed by Richard
2010-02-05MergeEli Linden
2010-02-05DEV-43688 cycle3 for JA fixing 3 stringsEli Linden
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-02-05EXT-4739 - Crash on teleport after viewer minimize. Making sure we don't ↵Eric M. Tulla (BigPapi)
accidentally set av self to null & added a few more null checks. -Reviewed by nyx
2010-02-05mergerichard
2010-02-05EXT-5025 - Tooltips block mouse clicksrichard
EXT-4547 [BSI] it is possible to highlight multiple layers of chat EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider EXT-3103 Add an option to restrict entering non-ascii symbols in text editor. reviewed by Leyla
2010-02-05automated merge viewer2.0->viewer2.0Loren Shih
2010-02-05EXT-4618 : Pasting an item into the COF folder creates a copy of the item, ↵Loren Shih
not a link EXT-5018 : Automatically reject leading separators from right click menu Trivial fix to remove "paste" as an option from the COF. Also contains a partial fix for EXT-5018.
2010-02-05trivial comment fixes.Tofu Linden
2010-02-05merge.Tofu Linden
2010-02-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Mark Palange (Mani)
2010-02-05mergeMark Palange (Mani)
2010-02-05EXT-4237 Fixed ShowStartLocation behavior.Mark Palange (Mani)
Now the show don't show behavior is always dependent on the ShowStartLocation pref. ShowStartLocation defaults to off, but is automatically turned on after first successful login. Reviewed by Richard.
2010-02-05Implemented critical task (EXT-4703) Add maturity icons to the Viewer 2 toolbar.Sergei Litovchuk
- Added maturity icons to location bar. - Added getting font used in LLLineEditor. --HG-- branch : product-engine
2010-02-05Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).Andrew Dyukov
- Added customizing string with notification about ending call depending on voice availability. - Added closing of open VCP if voice is disabled. --HG-- branch : product-engine
2010-02-05mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-05fix for major EXT-4833 [NUX] Verify the default size/positon of certain ↵Ychebotarev ProductEngine
floaters. I don't really like floater_world_map changes. as for me now it looks much worse... --HG-- branch : product-engine
2010-02-05fix for major EXT-4833 [NUX] Verify the default size/positon of certain ↵Ychebotarev ProductEngine
floaters. exept floater_world_map --HG-- branch : product-engine
2010-02-05Fixed normal bug EXT - 3232 (Make button image overlay placement adjustable ↵Paul Guslisty
via xml) --HG-- branch : product-engine
2010-02-05fix typoYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-05Fixed normal bug EXT-1622 ([BSI] When Chat Bubbles are enabled chat by users ↵Eugene Mutavchi
still shows in nearby chat toasts.) --HG-- branch : product-engine
2010-02-05Fixed low bug EXT-4217( Favorites overflow list closes after making ↵Eugene Mutavchi
copy/paste/delete) --HG-- branch : product-engine
2010-02-05Fixed normal bug EXT-4702 (Elements of type context_menu cannot have font ↵Eugene Mutavchi
set in XUI xml) --HG-- branch : product-engine
2010-02-05fixed bug EXT-4135 Region agent limit should be an integerDenis Serdjuk
--HG-- branch : product-engine
2010-02-05Fixed critical bug EXT - 4906 (Viewer crashes after group message was sent ↵Paul Guslisty
if close IM chat from message sender previously) --HG-- branch : product-engine
2010-02-05fixed bug EXT-4757 URL-name of object is shown as clickable HTTP URL in toastsDenis Serdjuk
Cause: ServerObjectMessage notification uses hardcoded message from simulator. There is no possible to escape object name separately. Solution: Whole server message has been escaped using <nolink> tag. --HG-- branch : product-engine
2010-02-05mergeVadim Savchuk
--HG-- branch : product-engine
2010-02-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine