summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-09-20merge from http://bitbucket.org/boroondas/viewer-development-vwr-20583Tofu Linden
2010-09-20merge storm-192Tofu Linden
2010-09-20STORM-192 ADDITIONAL FIX Fixed crash on pressing Ctrl+Shift+W (which closes ↵Vadim Savchuk
all floaters). The crash was introduced by my previous fix of this ticket in changeset 8ceebd3612f0. The problem was that, suprisingly, even invisible (faded) toasts were destroyed when you hit Ctrl_Shift+W, however they were still referenced by the toast pool, so the references were invalidated. The easiest fix would be to remove all references to the toast being destroyed, no matter is it visible or not. However, then we'd have to search for each destroyed toast in the pool, which is slow. Besides, removing toasts from the pool compromises the whole idea of pooling (which was introduced to speed up creation of new toasts). Another possible fix is not to destroy any nearby chat toasts when user hits Ctrl+Shift+W. That would save us from any crashes at a price of changing existing behaviour (the toasts will remain visible). So I went for a third option: when closing all floaters, skip invisible ones. Then there won't be attempts to destroy invisible (pooled) toasts, so the crash won't happen, and we don't seem to change any existing behavior. However I'm not 100% sure of the latter statement, so the fix requires extensive testing.
2010-09-20merge storm-159Tofu Linden
2010-09-18merge storm-192Tofu Linden
2010-09-18merge storm-153Tofu Linden
2010-09-17EXP-60 Hints not showing after Re-enabling Hints in same sessionRichard Linden
2010-09-17mergeRichard Linden
2010-09-17made address entry field of media browser select all text on first clickRichard Linden
2010-09-17fix for clicking on Invite Friends resulting in disabling popupsRichard Linden
2010-09-17STORM-183 : Pull in fix from VadimMerov Linden
2010-09-17Fix for EXP-78 (javascript window.open function with no size parameters ↵Monroe Linden
opens a tiny window when all popups setting is enabled).
2010-09-17clear popup notifications on navigateRichard Linden
2010-09-17maded popup alert last foreverRichard Linden
2010-09-18STORM-159 FIXED Added sharing inventory item by dropping it on resident's ↵Sergei Litovchuk
Profile SP even when no IM session is started with that resident.
2010-09-17fixed build (again)Richard Linden
2010-09-17MergeRichard Linden
2010-09-17Backed out changeset: d71309f8bd0eRichard Linden
2010-09-17mergeRichard Linden
2010-09-17fix for enable all popups not workingRichard Linden
also popup notification is no longer a singleton
2010-09-17Turn off new inventory hints until defect EXP-62 is fixedcallum
2010-09-17updated comment on MediaEnablePopups setting to reflect new behaviorRichard Linden
2010-09-17STORM-183 ADDITIONAL FIX Disabled the "Replace Current Outfit" option of the ↵Vadim Savchuk
inventory context menu for incomplete outfits.
2010-09-17fixed buildRichard Linden
2010-09-17STORM-192 FIXED Ctrl-Shift-W not to disable nearby chat toasts.Vadim Savchuk
Bug reason: The fix of EXT-1419 disables showing nearby chat showing toasts at all whenever you close one. That was done to prevent a crash when viewer is exiting, but closing a toast manually should be handled differently. Fix: If a toast is being closed (destroyed) manually, just remove it from the toast pool (to prevent further references to the invalid pointer), but keep on showing new toasts. I've overriden LLFloater::onClose() to differentiate the two cases.
2010-09-17allow_popups is now driven by trusted content flagRichard Linden
trusted content is now a const attribute of LLMediaCtrl, set in constructor params
2010-09-17EXP-74 FIX Pop-up warning given for links in Home Side Panel in ViewerRichard Linden
Reviewed by Callum
2010-09-17STORM-153 FIXED Localized Conference and non-existent IM session name strings.Andrew Dyukov
- Moved the "no session" string to XML and used it in code instead of hardcode. - Conference string turned out to be already translated, but the way translation was happening ad-hoc chat log files on disk would get localized names, and thus be inconsistent (and that would create problems with browsing them later). It didn't happen already just because this string wasn't translated in other locales somewhy. So moved localization of session name after the the creation of log file. Also changed value of string according to Eli's comment in ticket.
2010-09-17Merge in lenny workChristian Goetze (CG)
2010-09-17merge.Tofu Linden
2010-09-17merge dead-code removal from Andrew@PETofu Linden
2010-09-17merge storm-154Tofu Linden
2010-09-17STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
A little bit more clean up on LLPanelVoiceDeviceSettings while I'm in there.
2010-09-16fixed mergeRichard Linden
2010-09-16mergeRichard Linden
2010-09-16CT-575 WIP ES linguistic, remove invalid FR elementeli_linden
2010-09-16EXP-73 FIX hint cannot be dismissed with X and crashes browser when hint is ↵Richard Linden
triggered by user taking an object from inworld into inventory
2010-09-16VWR-22340 FIX en_xui_change for all langs, and remove many evil old overrideseli_linden
2010-09-16reverted mediaenablepopups to false by default (desired behavior)Richard Linden
always trigger popup notification and rely on ignore machinery to hide it
2010-09-16fix for all notifications being ignored by defaultRichard Linden
2010-09-16fixed buildRichard Linden
2010-09-16[STORM-175] Fix Ping Interpolate Object PositionOz Linden
2010-09-16mergeRichard Linden
2010-09-16EXP-73 FIX hint cannot be dismissed with X and crashes browser when hint is ↵Richard Linden
triggered by user taking an object from inworld into inventory
2010-09-16popup blocking notifications now handled in all web_browser instances, not ↵Richard Linden
just llfloatermediabrowser
2010-09-16added ability to have notification ignore variable point to settings.xml ↵Richard Linden
variables
2010-09-16renamed isProvided() to anyProvided() and fixed partial params (missing ↵Richard Linden
mandatory elements) not merging over complete params
2010-09-16EXP-63 FIX Hint marked as acted upon if hints are disabled while specific ↵Richard Linden
UI hint is open
2010-09-16Mergeeli_linden
2010-09-16VWR-22408 FIX en_xui_change to accommodate text for FR and PTeli_linden