From 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 Mon Sep 17 00:00:00 2001 From: Monroe Williams Date: Thu, 2 Aug 2007 01:18:34 +0000 Subject: Merge down from Branch_1-18-1: svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131 --- indra/newview/lldebugview.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'indra/newview/lldebugview.cpp') diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index d20c431987..4e0cc94a26 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -17,7 +17,6 @@ #include "llconsole.h" #include "lltextureview.h" #include "llresmgr.h" -#include "llaudiostatus.h" #include "imageids.h" #include "llvelocitybar.h" #include "llviewerwindow.h" @@ -89,19 +88,6 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) mStatViewp->setVisible(FALSE); addChild(mStatViewp); - // - // Audio debugging stuff - // - const S32 AUDIO_STATUS_LEFT = rect.getWidth()/2-100; - const S32 AUDIO_STATUS_WIDTH = 320; - const S32 AUDIO_STATUS_TOP = (rect.getHeight()/2)+400; - const S32 AUDIO_STATUS_HEIGHT = 320; - r.setLeftTopAndSize( AUDIO_STATUS_LEFT, AUDIO_STATUS_TOP, AUDIO_STATUS_WIDTH, AUDIO_STATUS_HEIGHT ); - LLAudiostatus* gAudioStatus = new LLAudiostatus("AudioStatus", r); - gAudioStatus->setFollowsTop(); - gAudioStatus->setFollowsRight(); - addChild(gAudioStatus); - const S32 VELOCITY_LEFT = 10; // 370; const S32 VELOCITY_WIDTH = 500; const S32 VELOCITY_TOP = 140; -- cgit v1.2.3