summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-15Mergeskolb
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-15Mergeskolb
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-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-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
2009-12-14Only do the "lowest interest loadable" calculation if we've already hit the ↵Monroe Linden
PluginInstancesTotal cap. Otherwise, we always need to load the top media data item.
2009-12-14Yet again more fixups for compile errors after the last merge...brad kittenbrink
2009-12-14L10N: used consistent terms between Pref > Advanced and floater_select_key !Ramzi Linden
2009-12-14DEV-43913: tweak positions of play & pause so they look like they are the ↵Rick Pasetto
same button
2009-12-14follow-up from my last changeRick Pasetto
2009-12-14DEV-42327: Compute controls position & size for HUD objectsRick Pasetto
Review #62 Added facility to get the HUD projection and modelview matrices by refactoring the calls in llviewerdisplay a bit.
2009-12-14Made LLViewerMedia::isInterestingEnough() take the performance manager's ↵Monroe Linden
priority list list into account.
2009-12-14mergerichard
2009-12-14mergerichard
2009-12-14manually mergerichard
2009-12-14Mergeskolb
2009-12-14Added EOL to file for Mac/Linux platformscallum
2009-12-14Merge with Tipcallum
2009-12-14EXT-1940 combo-box with dropdown list of scales overlaps Cancel btn un the ↵Lis Pardi
Texture dlg
2009-12-14Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media ↵callum
Settings : Controls tab"
2009-12-14mergerichard
2009-12-14Fix for mac build post-merge.brad kittenbrink
2009-12-14ext-3297 Input/Output devices are cut off in preferencesLis Pardi
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-14Allow selection of media faces even if there is no impl. We recordRick Pasetto
the target object and use that fact to raise its interest level. This is mostly a pass-off for monroe to take and run with
2009-12-14Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-14EXT-3338 Start up screen isn't resized - reviewed by richard, The LayoutmasterErica
2009-12-14Cleanup for errors post-merge.brad kittenbrink
2009-12-14Merge latest viewer 2-0 changes into mediaskolb
2009-12-14automated merge viewer2.0->viewer2.0.Loren Shih
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14EXT-3407 : "Recent Items" panel shows as emptyLoren Shih
The text in the search editor is now properly kept updated.
2009-12-14Mergeskolb
2009-12-14Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-14Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-14EXT-3426: Update Place buttons based on state.Lynx Linden
We now disable the teleport/map buttons when they cannot be used (when we don't have a global 3D position for the parcel). We also update this button enable state at the right times.
2009-12-14EXT-3426: Enable Teleport/Map buttons for all Places.Lynx Linden
When we open the Places side tray for a parcel, given a UUID, we now look up the parcel's global 3D position so that the teleport and map functions work correctly.
2009-12-14automated merge avp->viewer2.0Loren Shih
2009-12-14automated merge viewer2.0->viewer2.0Loren Shih
2009-12-14For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-13Fix Mac buildJames Cook
2009-12-13Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-13 EXT-3422 Add IM/Notification pending button art, style and layout of ↵Erica
overflow arrows, align message well with bottom bar
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 15:46:42 +0000