livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storm-1831 Removing the callback after first region crossing. Prevents repeated callbacks after highlighting has been removed for live script.

meow-7.2.2
Ima Mechanique 2014-03-26 20:31:05 +00:00
parent d6fdc6e68f
commit 8e53c5bfb0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpreviewscript.cpp
View File

@ -434,7 +434,7 @@ void LLScriptEdCore::updateKeywords()
if (mLive)
{
clearHighlights();
gAgent.removeRegionChangedCallback(mRegionChangedCallback);
mRegionChangedCallback.disconnect();
}
else
{
@ -458,9 +458,7 @@ void LLScriptEdCore::processLoaded()
void LLScriptEdCore::clearHighlights()
{
mEditor->mKeywords.clearLoaded();
mEditor->clearSegments();
mEditor->mKeywords.clear();
}
void LLScriptEdCore::processKeywords()
@ -1309,7 +1307,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
LLPreviewLSL::onSearchReplace,
self,
0);
self->mScriptEd->mLive = false;
return self->mScriptEd;
}
@ -1324,7 +1322,7 @@ LLPreviewLSL::LLPreviewLSL(const LLSD& key )
// virtual
BOOL LLPreviewLSL::postBuild()
{
const LLInventoryItem* item = getItem();
const LLInventoryItem* item = getItem();
llassert(item);
if (item)
@ -1756,7 +1754,6 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
//static
void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
{
LLLiveLSLEditor *self = (LLLiveLSLEditor*)userdata;
self->mScriptEd = new LLScriptEdCore(

1
indra/newview/llpreviewscript.h
View File

@ -162,6 +162,7 @@ private:
LLScriptEdContainer* mContainer; // parent view
public:
boost::signals2::connection mFileFetchedCallback;
boost::signals2::connection mRegionChangedCallback;
};