diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/newview/llfloaterscriptdebug.cpp | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 1cf10ae881..0ba75b71f6 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -31,10 +31,12 @@ LLFloaterScriptDebug* LLFloaterScriptDebug::sInstance = NULL; // // Member Functions // -LLFloaterScriptDebug::LLFloaterScriptDebug() -: LLMultiFloater() +LLFloaterScriptDebug::LLFloaterScriptDebug() : + LLMultiFloater() { - + // avoid resizing of the window to match + // the initial size of the tabbed-childs, whenever a tab is opened or closed + mAutoResize = FALSE; } LLFloaterScriptDebug::~LLFloaterScriptDebug() @@ -90,6 +92,9 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id) } LLFloater::setFloaterHost(NULL); + // Tabs sometimes overlap resize handle + sInstance->moveResizeHandleToFront(); + return floaterp; } |