summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-09-28Merge from viewer-beta, minus the version number change.Tofu Linden
2010-09-28merge STORM-282Tofu Linden
2010-09-28merge storm-210Tofu Linden
2010-09-28merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Boroondas Gupte
2010-09-27STORM-207 FIXED Favorites overflow menu didn't close when you press ESC.Vadim ProductEngine
Caused by the fix of EXT-4217 which I had to revert.
2010-09-27STORM-210 FIXED Implemented adding of ad-hoc call participans in Recent.Andrew Productengine
Both offline and online users are added. It is done in LLVoiceChannelGroup::activate(), where TODO for it was placed earlier. To avoid code duplication when adding users from speakers list to Recent, a new method was added to LLIMModel.
2010-09-27mergeTofu Linden
2010-09-27MergeKelly Washington
2010-09-27merge storm-153 re-fix.Tofu Linden
2010-09-27merge storm-228Tofu Linden
2010-09-27merge storm-190Tofu Linden
2010-09-27merge storm-173Tofu Linden
2010-09-27STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and ↵Andrew Productengine
syswell session names for adhoc. Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor. - Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180), so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
2010-09-27STORM-228 FIXED 'Loading / Done' text is cropped on the bottom of 'Find' floaterPaul Guslisty
-Increased space between bottom of the floater and bottom of the web browser (inside floater), so that 'Loading / Done' text between bottom of the web browser and bottom of the floater won't be cropped
2010-09-27STORM-190 FIXED text truncations in floater EDIT CONTENT PERMISSIONS.Sergei Litovchuk
- Increased overall floater width. - Increased permissions columns width. - Increased 'Check All' and 'Clear' buttons width. - Applied text wrapping to permissions labels. - Removed 'NextOwnerLabel' dimensions overrides for German. - Removed 'Check All' and 'Clear' buttons dimensions overrides for Polish.
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
make ctrl-f work from the script search box itself.
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
change to better / more consistent naming
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
let some LLViews handle shortcut keys if they want. reviewed with ambroff
2010-09-24STORM-173 : Add Build > Object > Return ObjectMerov Linden
2010-09-24merge storm-189 reduxTofu Linden
2010-09-23Pulling one bugfix changeset from another repository.Monroe Linden
2010-09-23mergeRichard Linden
2010-09-23fix for llviewernetwork integration testRichard Linden
2010-09-23Fixed some build errors in llmediaplugintest.cpp.Monroe Linden
Reviewed by Richard.
2010-09-23dummy commit to track experience team work:Richard Linden
EXP-11 UI Optimizations EXP-12 Selective Pop-up Blocking EXP-5 UI Hints EXP-6 Side Panel Tutorial EXP-3 Enable Pop-up Web Content EXP-13 Javascript Handling EXP-56 Add support for file picking to LLQtWebKit and hook up to media plugin EXP-59 Some buttons disappear when clicked QAR-3491 "Tutorial in the side panel" QAR-3448 "UI Hints Experience Sprint 1" QAR-3440 "Pop-Up Web Content in Viewer Experience Sprint 1 QAR" QAR-3439 "UI Performance Improvements Experience Sprint 1 QAR"
2010-09-24STORM-189 FIXED Truncations in DE ans ES locales in Build Tools floater.Seth ProductEngine
- Some checkboxes moved in DE locale and EN xml file. - Removed floater width override for ES locale.
2010-09-23mergeRichard Linden
2010-09-23STORM-199 MergeAimee Linden
2010-09-23STORM-153 ADDITIONAL FIX Fixed unlocalized chiclet tooltip and syswell ↵Andrew Productengine
session names for adhoc. Bug was caused by using incorrect (unlocalized) name of session as argument for some methods after the session name was localized in constructor. - Used correct (localized) session name instead.
2010-09-23merge storm-206Tofu Linden
2010-09-23mergeTofu Linden
2010-09-23Backed out changeset acb451f83a9dTofu Linden
original commit log for acb451f83a9d was: "Temporary changes to allow the viewer to build against an older version of llqtwebkit. NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out." So, yes, I'm backing that out.
2010-09-23STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory.Aimee Linden
(transplanted from f71072a1532b3fa3de98197dd0ceeb3071ac6856)
2010-09-23STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory.Aimee Linden
2010-09-23STORM-128 FIXED New friends list permission iconsAimee Linden
* Added new icon artwork. * Reordered the icons so that the most common ones are to the right, so that they change position as little as possible. * Removed old 1.23 icons. (transplanted from 5ed5fa607e2ce3eaabc8f9716bd4a6ef5933aa64)
2010-09-23STORM-128 FIXED New friends list permission iconsAimee Linden
* Added new icon artwork. * Reordered the icons so that the most common ones are to the right, so that they change position as little as possible. * Removed old 1.23 icons.
2010-09-23STORM-201 FIXED Substituted link to widgets page on internal LL wiki in test ↵Andrew Productengine
floater with external one.
2010-09-22fixed buildRichard Linden
2010-09-22mergeRichard Linden
2010-09-22Fix "no newline at end of file".Monroe Linden
2010-09-22mergeRichard Linden
2010-09-22fix for gccRichard Linden
2010-09-22Temporary changes to allow the viewer to build against an older version of ↵Monroe Linden
llqtwebkit. NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out.
2010-09-23STORM-199 FIXED Added wearing an object from Library if it was dragged to COFSergei Litovchuk
- Disabled moving items from in-world objects to COF or outfit folders not to create copies of items instead of links. - Enabled dropping a landmark from Library to certain position in Favorites folder which supports items reordering.
2010-09-22SH-188 FIX crash in llvoavatar.cppNyx (Neal Orman)
We were using a NULL pointer after checking it. Did some logic juggling to ensure that we only use the pointer if it is non-null Code reviewed by Seraph (transplanted from a90fe10ddac9545249c6f218af438a36bcbc3162)
2010-09-22instead of exposing mutable container in LLInitParam::Multiple, just expose ↵Richard Linden
access functions, begin(), end(), etc. this allows mutation of param block contents, without being able to change number of elements
2010-09-22fix for SH-173/VWR-22868: Development Viewer freezes just after startup / ↵Xiaohong Bao
greedy with file handles / 'WARNING: ll_apr_warn_status: APR: Too many open files' (transplanted from a9aefa70c029eb9dddec3833d0ce22ef4b4421b5)
2010-09-22merge storm-163 / Port of VWR-14914 to SG 2.0 : Intermittent FPS drop ↵Tofu Linden
related to "audio" (main thread hangs often on openal lock)
2010-09-22merge storm-187Tofu Linden
2010-09-22STORM-187 FIXED Fixed chatbar not getting back its width after ↵Andrew Productengine
opening/closing sidetray. The bug reproduced not only for opening/closing sidetray, but also when viewer window was resized. The chatbar's width was set to default on width increase, it was also shrunk even when there was enough space for it, and buttons could be shrunk instead. Also, width to which user resized it manually, was not used in resizes. Gave priority on resizes to nearby chat - i.e.: Before this fix priorities were- buttons are visible -> buttons are as wide as possible -> nearby is stretched. After this fix priorities are- buttons are visible -> nearby is stretched -> buttons are as wide as possible. - Added new member which stores width of nearbychat(either value that was recorded after user's manual resize of chatbar or default). Used it as a value to which chatbar tries to be resized on resizes. - Implemented the change of priorities described above in processWidthIncreased() and processWidthDecreased() methods.