diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-20 16:26:55 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-20 16:26:55 -0800 |
| commit | 1d9d099baae1b502f4fae02238330c06bf49adb2 (patch) | |
| tree | adff5faf12609fa21ebff9d2c435b9a19e3e045d /indra/newview | |
| parent | 20bcd7efeb9302fc7fee442f9079fc208a2341fa (diff) | |
| parent | daef055db99d79b700eb9aed63d869b64a45acb0 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 386fb7f909..88a98c3350 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1104,7 +1104,8 @@ void LLFloaterTools::getMediaState() childSetEnabled("edit_media", FALSE); childSetEnabled("media_info", FALSE); media_info->setEnabled(FALSE); - media_info->clear();*/ + media_info->clear();*/ + LL_WARNS("LLFloaterTools: media") << "Media not enabled (no capability) in this region!" << LL_ENDL; clearMediaSettings(); return; } |