summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpreviewscript.h')
-rwxr-xr-xindra/newview/llpreviewscript.h19
1 files changed, 17 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 9fb0a4fb63..dc4f828cf1 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -35,6 +35,7 @@
#include "lliconctrl.h"
#include "llframetimer.h"
#include "llfloatergotoline.h"
+#include "llsyntaxid.h"
class LLLiveLSLFile;
class LLMessageSystem;
@@ -76,7 +77,12 @@ protected:
public:
~LLScriptEdCore();
+ void clearHighlights();
+ void initialiseKeywords();
void initMenu();
+ void processKeywords();
+ void processLoaded();
+ void updateKeywords();
virtual void draw();
/*virtual*/ BOOL postBuild();
@@ -130,6 +136,8 @@ protected:
void addHelpItemToHistory(const std::string& help_string);
static void onErrorList(LLUICtrl*, void* user_data);
+ bool mLive;
+
private:
std::string mSampleText;
LLTextEditor* mEditor;
@@ -149,8 +157,14 @@ private:
BOOL mEnableSave;
BOOL mHasScriptData;
LLLiveLSLFile* mLiveFile;
+ LLSyntaxIdLSL mSyntaxIdLSL;
LLScriptEdContainer* mContainer; // parent view
+
+public:
+ boost::signals2::connection mFileFetchedCallback;
+ boost::signals2::connection mRegionChangedCallback;
+
};
class LLScriptEdContainer : public LLPreview
@@ -159,6 +173,7 @@ class LLScriptEdContainer : public LLPreview
public:
LLScriptEdContainer(const LLSD& key);
+ LLScriptEdContainer(const LLSD& key, const bool live);
protected:
std::string getTmpFileName();
@@ -168,7 +183,7 @@ protected:
LLScriptEdCore* mScriptEd;
};
-// Used to view and edit a LSL from your inventory.
+// Used to view and edit an LSL script from your inventory.
class LLPreviewLSL : public LLScriptEdContainer
{
public:
@@ -213,7 +228,7 @@ protected:
};
-// Used to view and edit an LSL that is attached to an object.
+// Used to view and edit an LSL script that is attached to an object.
class LLLiveLSLEditor : public LLScriptEdContainer
{
friend class LLLiveLSLFile;