summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-23mergePalmer Truelson
2010-02-23Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-02-23FIX EXT-5517: clear hover face when cursor hovers over Nearby Media panelRick Pasetto
Review #140 This isn't the most generalized solution, but it fixes the proximal problem of selecting items in the Nearby Media panel, and is low risk because the code change is isolated to that panel.
2010-02-23FIX EXT-5680: Get rid of unnecessary code that formats the media item countRick Pasetto
Review #139 The crash was happening because the German (locale "de") version of the format string had an ​%ls in it, which was causing the crash. Getting rid of the widget and the string since it is no longer desired in the design.
2010-02-23DEV-46346 Cycle5 JA changeEli Linden
2010-02-23MergeEli Linden
2010-02-23EXT-5575 DE linguistic fixEli Linden
2010-02-23DEV-46346 A few missing strings from cycle3 for JA FR. This didn't make the ↵Eli Linden
2/23 public beta cut.
2010-02-23EXT-5451 - HUD attachment points offset, when extending the right UI panelRichard Linden
reviewed by Callum
2010-02-23mergeRichard Linden
2010-02-23gah, more dos line-endings in PE diffs.Tofu Linden
2010-02-23PE merge.Tofu Linden
2010-02-23Removed an unnecessary include.Vadim Savchuk
--HG-- branch : product-engine
2010-02-23Fixed low priority bug EXT-5653 (View Profile: Hand-pointer is shown when ↵Vadim Savchuk
hovering mouse above homepage that isn't a valid URL). Removed an unnecessary on-click callback (that caused the cursor change) from the textbox. --HG-- branch : product-engine
2010-02-23mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-23fix for normal EXT-5598 Group member status list is sorted by name instead ↵Ychebotarev ProductEngine
of date --HG-- branch : product-engine
2010-02-23mergeangela
2010-02-23Fixed normal bug (EXT-5554) 'Land for Sale' icon should always be visible.Sergei Litovchuk
- Made 'Land for Sale' icon visible in Navigation bar even if "Show Parcel Properties" is off. --HG-- branch : product-engine
2010-02-23slightly reduce the overhead of 'EXT-5601: Linux: volume adjustment of ↵Tofu Linden
web-based media / Flash'
2010-02-23Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-02-23merg and resolve conflictsangela
2010-02-23revert some changed from EXT-5410 but keep the changes for disabling ↵angela
streaming audio when music or media is disabled. reviewed by rick
2010-02-22EXT-5410 Streaming audio does ignores preference setting.angela
2010-02-19mergeRichard Linden
2010-02-17mergeRichard Linden
2010-02-13a better fix for the blend-factor init problem. I think.Tofu Linden
2010-02-13CID-208Tofu Linden
Checker: REVERSE_INULL Function: LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup *) File: /indra/newview/llvovolume.cpp
2010-02-13CID-145Tofu Linden
Checker: NULL_RETURNS File: /indra/llui/llscrolllistctrl.cpp
2010-02-13CID-144Tofu Linden
Checker: NULL_RETURNS Function: LLInvFVBridgeAction::doAction(const LLUUID &, LLInventoryModel *) File: /indra/newview/llinventorybridge.cpp
2010-02-13CID-139Tofu Linden
Checker: NULL_RETURNS Function: LLPanelFaceSetTEFunctor::apply(LLViewerObject *, int) File: /indra/newview/llpanelface.cpp
2010-02-13CID-138Tofu Linden
Checker: NULL_RETURNS Function: LLPanelFace::sendGlow() File: /indra/newview/llpanelface.cpp
2010-02-13CID-134Tofu Linden
Checker: NULL_RETURNS Function: LLToolsEnableUnlink::handleEvent(const LLSD &) File: /indra/newview/llviewermenu.cpp
2010-02-13CID-132Tofu Linden
Checker: NULL_RETURNS Function: LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCategory *) File: /indra/newview/llpanellandmarkinfo.cpp
2010-02-13sigh, fix another backout-backout problem.Tofu Linden
2010-02-13restore blend factor init fix.Tofu Linden
2010-02-13restore casting fix.Tofu Linden
2010-02-13backout merge.Tofu Linden
2010-02-13Backed out changeset ac249fda538fTofu Linden
2010-02-13backout merge.Tofu Linden
2010-02-13Backed out changeset f196197a816aTofu Linden
2010-02-13merge backout.Tofu Linden
2010-02-13Backed out changeset 6c161782dba3Tofu Linden
2010-02-13resolve.Tofu Linden
2010-02-13Backed out changeset d89b00b44ab6Tofu Linden
2010-02-13merge from viewer2. this fucks up davep's optimizations, so I'll backout ↵Tofu Linden
their backout next to restore them. I hope. Sheesh.
2010-02-13PE merge.Tofu Linden
2010-02-12mergePalmer Truelson
2010-02-12Backed out davep's optimization pass. changeset 3c3685de430aPalmer Truelson
2010-02-12mergePalmer Truelson
2010-02-12Backed out davep's UI optimization. changeset 3134cb7bb181Palmer Truelson