summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
2010-02-12mergePalmer Truelson
2010-02-12Backed out dave's FSAA/FBO change changeset 89f62bede16fPalmer Truelson
2010-02-12mergePalmer Truelson
2010-02-12Backed out bao's fix to FSAA that will also be backed out. changeset ↵Palmer Truelson
ae9bbbf181d9
2010-02-12Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclassesRick Pasetto
2010-02-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Erica
2010-02-12EXT-5365change shoe icon in Viewer 2.0 inventory listErica
2010-02-12cast type F32 to GLint to eliminate some compiling warnings.Xiaohong Bao
2010-02-12potential fix for bad font namesRichard Linden
2010-02-12added popup panel to hold nearby media popup and stopped using top viewRichard Linden
2010-02-12Changing viewer unit test licenses to viewergplMark Palange (Mani)
2010-02-12mergePalmer
2010-02-12Merge with tipCallum Prentice
2010-02-12"Fix for EXT-4968 - Media DnD cannot navigate prims owned by other people"Callum Prentice
Reviewed by Rick via CodeCollab (http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=110)
2010-02-12mergePalmer
2010-02-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-12Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclassesRick Pasetto
2010-02-12fix for EXT-4653: Textures saved with "Save As" appear to be very low rez. ↵Xiaohong Bao
and beyond: remove saved raw image automatically.
2010-02-12some code dents change (nothing else).Xiaohong Bao