summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-15Mergeskolb
2009-12-15Misnamed additional Qt/WebKit DLL.callum
2009-12-15Updated llqtwebkit 4.6 build, with link-target and cookie-saving patches ↵Monroe Linden
applied.
2009-12-15Merge with tip before pushcallum
2009-12-15client changes to work with new version of Qt (4.6) and to do some cleanup ↵callum
at plugin exit so that cookies more betterer than what they did before.
2009-12-15Add a PrimMediaMasterEnabled debug flag to allow us to disable the media ↵Rick Pasetto
data client Conceptually reviewed by Monroe
2009-12-15Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-15mergeLynx Linden
2009-12-15EXT-3496: Add a common authentication key for search and home.Lynx Linden
Search and the Home sidetray now have their own specific authentication keys that they support from login.cgi, but they fallback to a common key as follows: Search: "search_token", fallback to "auth_token" Home: "home_sidetray_token", fallback to "auth_token"
2009-12-15Mergeskolb
2009-12-15Mergeskolb
2009-12-15EXT-3180: Update Home sidetray to temporary URL.Lynx Linden
2009-12-15MergeRunitai
2009-12-15EXT-3488 Fix for sky not being reflected in water any more.Runitai
2009-12-15MergeSteve Bennetts
2009-12-15Fixed an edge case that was triggering an error check when doing HTTP ↵Steve Bennetts
texture fetches.
2009-12-15mergeRick Pasetto
2009-12-15Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/Rick Pasetto
2009-12-15Mergeskolb
2009-12-15Mergeskolb
2009-12-15Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-15fix for post merge compile error (minor)Eric M. Tulla (BigPapi)
2009-12-15L10N: some legacy strings were left in panel_preferences_setup.xml. At least ↵Ramzi Linden
I will make them consistent.
2009-12-15Merging in latest PE changes from ↵Eric M. Tulla (BigPapi)
https://hg.aws.productengine.com/secondlife/viewer-2-0/
2009-12-15New mac build of llqtwebkit.Monroe Linden
This build is based on the following: http://bitbucket.org/girish/llqtwebkit-4.6/ revision 08c337619f50 local change: comment out the definition of qt_sendSpontaneousEvent() in llembeddedbrowserwindow.cpp git://gitorious.org/~girish/qt/girishs-qt.git branch lindenqt revision b4820037eac5c52d44df99ec37a50edd1796c897
2009-12-15added more comments to codeMike Antipov
--HG-- branch : product-engine
2009-12-15Mergeskolb
2009-12-15Work on task EXT-3147 (Implement new states for message indicators)Mike Antipov
-- Implemented requirement: Opening either Message Well will clear the "new messages" state (and thus the "lit" status), even though there may still be unread messages --HG-- branch : product-engine
2009-12-15EXT-3441: Support various substitutions for Search URL.Lynx Linden
The search URL is now specified in app_settings/settings.xml (instead of in floater_search.xml), and it is now defined more flexibly with support for various substitution strings, such as [QUERY], [AUTH_KEY], [MATURITY], [GODLIKE], etc. I pulled the common substitution code out into a new static method, LLWeb::expandURLSubstitutions(). This provides support for common strings like [VERSION], [CHANNEL], [LANGUAGE], [OS], etc. The Help and Home sidetray code has been updated to use this new function, to avoid replicating this behavior 3 times. I also cleaned up the app_settings/settings.xml file and removed the old search keys of: SearchURLDefault, SearchURLQuery, and SearchURLSuffix2.
2009-12-15Work on task EXT-3147 (Implement new states for message indicators)Mike Antipov
-- fixed bug: Well icon leaves in "Unlit" state if new message arrives when it is in the "Lit" state while flashing Improved behavior of reversing Lit/Unlit states --HG-- branch : product-engine
2009-12-15Work on task EXT-3147 (Implement new states for message indicators)Mike Antipov
-- Code recactored for future implementation of "Opening either Message Well will clear the "new messages" state (and thus the "lit" status)" --HG-- branch : product-engine
2009-12-15Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-12-15mplemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice ↵Alexei Arabadji
control panel is opened”; --HG-- branch : product-engine
2009-12-15Fixed normal bug EXT-3409 "Places panel: pick for remote location created ↵Sergei Litovchuk
with current agent's coordinates". - Fixed storing global position for remote location pick. - Fixed setting current location to the pick. - Fixed pick location text. Added resolving remote parcel name from ID. - Cleaned up unused code in llpanelpick. --HG-- branch : product-engine
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-15Fix for normal bug EXT-3465 - Any changes made in Preferences floater are ↵Dmitry Zaporozhan
canceled after viewer shutdown. --HG-- branch : product-engine
2009-12-15fix for bug EXT-3254 IM well expands unexpectedly after attempt to resizeYuri Chebotarev
problem was with floater minHeight. set minheight to 1 list item height (so 1 item is always visible) --HG-- branch : product-engine
2009-12-15fix for normal EXT-3252 IM well closes if the lower IM session has been closedYuri Chebotarev
--HG-- branch : product-engine
2009-12-15EXT-3394: Reverting removal of prefs volume slider.Lynx Linden
This change reverts the code parts of e038c0211968 that relate to the sound preferences slider. Lis has already re-enabled the slider in the panel_preferences_sound.xml XUI file. So the overall change for EXT-3394 is now: - remove the volume slider from the Voice Controls panel - make 50 be the default volume level, not 62
2009-12-15Update for normal task EXT-3089 - Notification toasts positioning, layering ↵Dmitry Zaporozhan
and stacking. Docked LLDialogs are part of toasts positioning rules. --HG-- branch : product-engine
2009-12-15Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-12-15mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby ↵Alexei Arabadji
chat, should work as toggles”, made hide/unhide dockable floaters when undocked; --HG-- branch : product-engine
2009-12-15Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places panel)Paul Guslisty
--HG-- branch : product-engine
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-14Change LLViewerMedia::isInterestingEnough() to also check selectionRick Pasetto
If the object is in the selection, its interesting. Load its media data ASAP. Conceptually reviewed by monroe
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-14DEV-43872: Change Home URL and Current URL to Home Page and Current PageRick Pasetto
2009-12-14Final merge of precompiled header dependency cleanup work.brad kittenbrink