diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-05 18:15:43 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-05 18:15:43 -0700 |
| commit | f0dd8c460362c78e4d17be16c153ad618d4dd60e (patch) | |
| tree | 146d8e28df69da8b556ccc14e670272a56631df9 /indra/newview | |
| parent | aba67da38b8b983f043b536b9743f80abfb6e33a (diff) | |
Back out changes accidentally checked in with last commit
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/logcontrol.xml | 3 | ||||
| -rw-r--r-- | indra/newview/llmediadataclient.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 85cb3cf1b4..0524834747 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -35,15 +35,12 @@ </array> <key>classes</key> <array> - <string>LLMediaDataClient</string> </array> <key>files</key> <array> </array> <key>tags</key> <array> - <string>LLMediaDataClient</string> - <string>MediaOnAPrim</string> </array> </map> </array> diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp index c356f55315..7ef26fd0e2 100644 --- a/indra/newview/llmediadataclient.cpp +++ b/indra/newview/llmediadataclient.cpp @@ -618,6 +618,6 @@ void LLObjectMediaNavigateClient::Responder::bounceBack() if (mep && impl) { - impl->navigateTo(mep->getCurrentURL(), "", false, true); +// impl->navigateTo(mep->getCurrentURL(), "", false, true); } } |