diff options
| author | Richard Linden <none@none> | 2010-08-12 09:53:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 09:53:17 -0700 |
| commit | 402e2a181831d30a6a2586fd4b0641ba66da99be (patch) | |
| tree | 335f57714bbc00510ede9e60c3d363722ef6ee43 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | be50a053ed4ae7d0b15fc20f1c6ca0973c56ffd9 (diff) | |
| parent | 4e8c33e7252d38d00b5606e1960aa520c75e0227 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 81e805974f..583b41aa57 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -985,6 +985,13 @@ void LLPanelPrimMediaControls::onClickZoom() void LLPanelPrimMediaControls::nextZoomLevel() { + LLViewerObject* objectp = getTargetObject(); + if(objectp && objectp->isHUDAttachment()) + { + // Never allow zooming on HUD attachments. + return; + } + int index = 0; while (index < kNumZoomLevels) { |