diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-11 23:17:31 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-11 23:17:31 -0600 |
| commit | 059a29e976a41c30ec9fb346ae53bbc51aa682fc (patch) | |
| tree | d03f6bbadedcfcf04be1e86605e46edd62b325b5 /indra/newview/llpreviewscript.cpp | |
| parent | a354d0efb33ddace2ef97e702b1e4449adcf51ad (diff) | |
Fix callback signal, Eliminate some unnecessary statics
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rwxr-xr-x | indra/newview/llpreviewscript.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index befec98849..d83a2bc3a6 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -374,7 +374,6 @@ LLScriptEdCore::LLScriptEdCore( setXMLFilename("panel_script_ed.xml"); llassert_always(mContainer != NULL); - mRegionChangedCallback = gAgent.addRegionChangedCallback(boost::bind(&LLScriptEdCore::updateKeywords, this)); } LLScriptEdCore::~LLScriptEdCore() @@ -391,6 +390,7 @@ LLScriptEdCore::~LLScriptEdCore() delete mLiveFile; mRegionChangedCallback.disconnect(); + mFileFetchedCallback.disconnect(); } BOOL LLScriptEdCore::postBuild() @@ -409,7 +409,7 @@ BOOL LLScriptEdCore::postBuild() initMenu(); - LLSyntaxIdLSL::getInstance()->addFileFetchedCallback(boost::bind(&LLScriptEdCore::processKeywords, this)); + mFileFetchedCallback = LLSyntaxIdLSL::getInstance()->addFileFetchedCallback(boost::bind(&LLScriptEdCore::processKeywords, this)); // Intialise keyword highlighting for the current simulator's version of LSL LLSyntaxIdLSL::getInstance()->initialize(); @@ -422,6 +422,7 @@ BOOL LLScriptEdCore::postBuild() { LL_DEBUGS("SyntaxLSL") << "Hashes are the same, no need to update highlighter." << LL_ENDL; } + mRegionChangedCallback = gAgent.addRegionChangedCallback(boost::bind(&LLScriptEdCore::updateKeywords, this)); return TRUE; } |