aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewscript.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-09-13 12:53:32 -0700
committerMcCabe Maxsted2011-09-13 13:21:33 -0700
commit03d006a9d34200aac9672c2f765b76ad8e688429 (patch)
tree9f339d7a494d0c3587cf67e7d93ceab89a42f3a7 /linden/indra/newview/llpreviewscript.h
parentPorted external script editor patch from Phoenix, added some cleanup, and mad... (diff)
downloadmeta-impy-03d006a9d34200aac9672c2f765b76ad8e688429.zip
meta-impy-03d006a9d34200aac9672c2f765b76ad8e688429.tar.gz
meta-impy-03d006a9d34200aac9672c2f765b76ad8e688429.tar.bz2
meta-impy-03d006a9d34200aac9672c2f765b76ad8e688429.tar.xz
Fixed the script editor constantly searching for an update that doesn't exist (also some more cleanup)
Diffstat (limited to 'linden/indra/newview/llpreviewscript.h')
-rw-r--r--linden/indra/newview/llpreviewscript.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 4de886e..cb9cdf4 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -128,7 +128,7 @@ public:
128 128
129 void autoSave(); 129 void autoSave();
130 //dim external ed 130 //dim external ed
131 void XedUpd(); 131 void xedUpdateScript();
132 void xedLaunch(); 132 void xedLaunch();
133 133
134 virtual BOOL handleKeyHere(KEY key, MASK mask); 134 virtual BOOL handleKeyHere(KEY key, MASK mask);
@@ -150,9 +150,8 @@ private:
150 std::string mSampleText; 150 std::string mSampleText;
151 std::string mAutosaveFilename; 151 std::string mAutosaveFilename;
152 std::string mXfname; 152 std::string mXfname;
153 struct stat mXstbuf; 153 llstat mXstbuf;
154 std::string mHelpURL; 154 std::string mHelpURL;
155 std::string mScriptTitle;
156 LLTextEditor* mEditor; 155 LLTextEditor* mEditor;
157 void (*mLoadCallback)(void* userdata); 156 void (*mLoadCallback)(void* userdata);
158 void (*mSaveCallback)(void* userdata, BOOL close_after_save); 157 void (*mSaveCallback)(void* userdata, BOOL close_after_save);
@@ -160,8 +159,7 @@ private:
160 void* mUserdata; 159 void* mUserdata;
161 LLComboBox *mFunctions; 160 LLComboBox *mFunctions;
162 BOOL mForceClose; 161 BOOL mForceClose;
163 //LLPanel* mGuiPanel; 162 //LLPanel* mCodePanel;
164 LLPanel* mCodePanel;
165 LLScrollListCtrl* mErrorList; 163 LLScrollListCtrl* mErrorList;
166 LLDynamicArray<LLEntryAndEdCore*> mBridges; 164 LLDynamicArray<LLEntryAndEdCore*> mBridges;
167 LLHandle<LLFloater> mLiveHelpHandle; 165 LLHandle<LLFloater> mLiveHelpHandle;
@@ -180,9 +178,10 @@ class LLPreviewLSL : public LLPreview
180public: 178public:
181 LLPreviewLSL(const std::string& name, const LLRect& rect, const std::string& title, 179 LLPreviewLSL(const std::string& name, const LLRect& rect, const std::string& title,
182 const LLUUID& item_uuid ); 180 const LLUUID& item_uuid );
181 ~LLPreviewLSL();
182
183 virtual void callbackLSLCompileSucceeded(); 183 virtual void callbackLSLCompileSucceeded();
184 virtual void callbackLSLCompileFailed(const LLSD& compile_errors); 184 virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
185
186 /*virtual*/ void open(); /*Flawfinder: ignore*/ 185 /*virtual*/ void open(); /*Flawfinder: ignore*/
187 186
188protected: 187protected: