[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
344 lines
11 KiB
C++
344 lines
11 KiB
C++
/**
|
|
* @file llpreviewscript.h
|
|
* @brief LLPreviewScript class definition
|
|
*
|
|
* $LicenseInfo:firstyear=2002&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2002-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_LLPREVIEWSCRIPT_H
|
|
#define LL_LLPREVIEWSCRIPT_H
|
|
|
|
#include "llpreview.h"
|
|
#include "lltabcontainer.h"
|
|
#include "llinventory.h"
|
|
#include "llcombobox.h"
|
|
#include "lliconctrl.h"
|
|
#include "llframetimer.h"
|
|
|
|
class LLLiveLSLFile;
|
|
class LLMessageSystem;
|
|
class LLTextEditor;
|
|
class LLButton;
|
|
class LLCheckBoxCtrl;
|
|
class LLScrollListCtrl;
|
|
class LLViewerObject;
|
|
struct LLEntryAndEdCore;
|
|
class LLMenuBarGL;
|
|
class LLKeywordToken;
|
|
class AIFilePicker;
|
|
class LLScriptEdContainer;
|
|
|
|
// Inner, implementation class. LLPreviewScript and LLLiveLSLEditor each own one of these.
|
|
class LLScriptEdCore : public LLPanel
|
|
{
|
|
friend class LLPreviewScript;
|
|
friend class LLPreviewLSL;
|
|
friend class LLLiveLSLEditor;
|
|
friend class LLFloaterSearchReplace;
|
|
friend class LLScriptEdContainer;
|
|
|
|
public:
|
|
static void parseFunctions(const std::string& filename);
|
|
|
|
protected:
|
|
// Supposed to be invoked only by the container.
|
|
LLScriptEdCore(
|
|
LLScriptEdContainer* container,
|
|
const std::string& sample,
|
|
const LLHandle<LLFloater>& floater_handle,
|
|
void (*load_callback)(void* userdata),
|
|
void (*save_callback)(void* userdata, BOOL close_after_save),
|
|
void (*search_replace_callback)(void* userdata),
|
|
void* userdata,
|
|
S32 bottom_pad = 0); // pad below bottom row of buttons
|
|
public:
|
|
~LLScriptEdCore();
|
|
|
|
void initMenu();
|
|
|
|
void draw() override;
|
|
BOOL postBuild() override;
|
|
BOOL canClose();
|
|
void setEnableEditing(bool enable);
|
|
|
|
void setScriptText(const std::string& text, BOOL is_valid);
|
|
bool loadScriptText(const std::string& filename);
|
|
bool writeToFile(const std::string& filename);
|
|
void sync();
|
|
|
|
void doSave( BOOL close_after_save );
|
|
|
|
bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
|
|
bool handleReloadFromServerDialog(const LLSD& notification, const LLSD& response);
|
|
|
|
void openInExternalEditor();
|
|
|
|
static void onCheckLock(LLUICtrl*, void*);
|
|
static void onHelpComboCommit(LLUICtrl* ctrl, void* userdata);
|
|
static void onClickBack(void* userdata);
|
|
static void onClickForward(void* userdata);
|
|
static void onBtnInsertSample(void*);
|
|
static void onBtnInsertFunction(LLUICtrl*, void*);
|
|
// Singu TODO: modernize the menu callbacks and get rid of/update this giant block of static functions
|
|
static BOOL hasChanged(void* userdata);
|
|
static void onBtnSave(void*);
|
|
static void onBtnUndoChanges(void*);
|
|
static void onSearchMenu(void* userdata);
|
|
|
|
static void onUndoMenu(void* userdata);
|
|
static void onRedoMenu(void* userdata);
|
|
static void onCutMenu(void* userdata);
|
|
static void onCopyMenu(void* userdata);
|
|
static void onPasteMenu(void* userdata);
|
|
static void onSelectAllMenu(void* userdata);
|
|
static void onDeselectMenu(void* userdata);
|
|
|
|
static BOOL enableUndoMenu(void* userdata);
|
|
static BOOL enableRedoMenu(void* userdata);
|
|
static BOOL enableCutMenu(void* userdata);
|
|
static BOOL enableCopyMenu(void* userdata);
|
|
static BOOL enablePasteMenu(void* userdata);
|
|
static BOOL enableSelectAllMenu(void* userdata);
|
|
static BOOL enableDeselectMenu(void* userdata);
|
|
|
|
bool hasAccelerators() const override { return true; }
|
|
LLUUID getAssociatedExperience() const;
|
|
void setAssociatedExperience(const LLUUID& experience_id);
|
|
|
|
private:
|
|
static bool onHelpWebDialog(const LLSD& notification, const LLSD& response);
|
|
static void onBtnHelp(void* userdata);
|
|
static void onBtnDynamicHelp(void* userdata);
|
|
void onBtnUndoChanges();
|
|
|
|
bool hasChanged();
|
|
|
|
void selectFirstError();
|
|
|
|
BOOL handleKeyHere(KEY key, MASK mask) override;
|
|
|
|
void enableSave(BOOL b) {mEnableSave = b;}
|
|
|
|
protected:
|
|
void deleteBridges();
|
|
void setHelpPage(const std::string& help_string);
|
|
void updateDynamicHelp(BOOL immediate = FALSE);
|
|
void addHelpItemToHistory(const std::string& help_string);
|
|
static void onErrorList(LLUICtrl*, void* user_data);
|
|
|
|
private:
|
|
std::string mSampleText;
|
|
LLTextEditor* mEditor;
|
|
void (*mLoadCallback)(void* userdata);
|
|
void (*mSaveCallback)(void* userdata, BOOL close_after_save);
|
|
void (*mSearchReplaceCallback) (void* userdata);
|
|
void* mUserdata;
|
|
LLComboBox *mFunctions;
|
|
BOOL mForceClose;
|
|
LLPanel* mCodePanel;
|
|
LLScrollListCtrl* mErrorList;
|
|
std::vector<LLEntryAndEdCore*> mBridges;
|
|
LLHandle<LLFloater> mLiveHelpHandle;
|
|
LLKeywordToken* mLastHelpToken;
|
|
LLFrameTimer mLiveHelpTimer;
|
|
S32 mLiveHelpHistorySize;
|
|
BOOL mEnableSave;
|
|
BOOL mHasScriptData;
|
|
LLLiveLSLFile* mLiveFile;
|
|
LLUUID mAssociatedExperience;
|
|
|
|
LLScriptEdContainer* mContainer; // parent view
|
|
|
|
struct LSLFunctionProps
|
|
{
|
|
std::string mName;
|
|
F32 mSleepTime;
|
|
bool mGodOnly;
|
|
};
|
|
static std::vector<LSLFunctionProps> mParsedFunctions;
|
|
};
|
|
|
|
class LLScriptEdContainer : public LLPreview
|
|
{
|
|
friend class LLScriptEdCore;
|
|
friend class LLMultiPreview;
|
|
|
|
public:
|
|
LLScriptEdContainer(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id = LLUUID::null);
|
|
|
|
protected:
|
|
std::string getTmpFileName();
|
|
bool onExternalChange(const std::string& filename);
|
|
virtual void saveIfNeeded(bool sync = true) = 0;
|
|
|
|
LLTextEditor* getEditor() const { return mScriptEd->mEditor; }
|
|
/*virtual*/ const char *getTitleName() const override { return "Script"; }
|
|
// <edit>
|
|
/*virtual*/ BOOL canSaveAs() const override;
|
|
/*virtual*/ void saveAs() override;
|
|
void saveAs_continued(AIFilePicker* filepicker);
|
|
// </edit>
|
|
|
|
LLScriptEdCore* mScriptEd;
|
|
};
|
|
|
|
// Used to view and edit an LSL script from your inventory.
|
|
class LLPreviewLSL final : public LLScriptEdContainer
|
|
{
|
|
public:
|
|
LLPreviewLSL(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid );
|
|
virtual void callbackLSLCompileSucceeded();
|
|
virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
|
|
|
|
/*virtual*/ BOOL postBuild() override;
|
|
|
|
|
|
protected:
|
|
BOOL canClose() override;
|
|
void closeIfNeeded();
|
|
|
|
void loadAsset() override;
|
|
/*virtual*/ void saveIfNeeded(bool sync = true) override;
|
|
void uploadAssetViaCaps(const std::string& url,
|
|
const std::string& filename,
|
|
const LLUUID& item_id);
|
|
|
|
static void onSearchReplace(void* userdata);
|
|
static void onLoad(void* userdata);
|
|
static void onSave(void* userdata, BOOL close_after_save);
|
|
|
|
static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
|
|
LLAssetType::EType type,
|
|
void* user_data, S32 status, LLExtStat ext_status);
|
|
|
|
protected:
|
|
static void* createScriptEdPanel(void* userdata);
|
|
|
|
|
|
protected:
|
|
|
|
// Can safely close only after both text and bytecode are uploaded
|
|
S32 mPendingUploads;
|
|
|
|
};
|
|
|
|
|
|
// Used to view and edit an LSL script that is attached to an object.
|
|
class LLLiveLSLEditor final : public LLScriptEdContainer
|
|
{
|
|
friend class LLLiveLSLFile;
|
|
public:
|
|
LLLiveLSLEditor(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& object_id, const LLUUID& item_id);
|
|
|
|
|
|
static void processScriptRunningReply(LLMessageSystem* msg, void**);
|
|
|
|
virtual void callbackLSLCompileSucceeded(const LLUUID& task_id,
|
|
const LLUUID& item_id,
|
|
bool is_script_running);
|
|
virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
|
|
|
|
/*virtual*/ BOOL postBuild() override;
|
|
|
|
void setIsNew() { mIsNew = TRUE; }
|
|
|
|
static void setAssociatedExperience(LLHandle<LLLiveLSLEditor> editor, const LLSD& experience);
|
|
static void onToggleExperience(LLUICtrl* ui, void* userdata);
|
|
static void onViewProfile(LLUICtrl* ui, void* userdata);
|
|
|
|
void setExperienceIds(const LLSD& experience_ids);
|
|
void buildExperienceList();
|
|
void updateExperiencePanel();
|
|
void requestExperiences();
|
|
void experienceChanged();
|
|
void addAssociatedExperience(const LLSD& experience);
|
|
|
|
private:
|
|
BOOL canClose() override;
|
|
void closeIfNeeded();
|
|
void draw() override;
|
|
|
|
void loadAsset() override;
|
|
void loadAsset(BOOL is_new);
|
|
/*virtual*/ void saveIfNeeded(bool sync = true) override;
|
|
void uploadAssetViaCaps(const std::string& url,
|
|
const std::string& filename,
|
|
const LLUUID& task_id,
|
|
const LLUUID& item_id,
|
|
BOOL is_running,
|
|
const LLUUID& experience_public_id);
|
|
BOOL monoChecked() const;
|
|
|
|
|
|
static void onSearchReplace(void* userdata);
|
|
static void onLoad(void* userdata);
|
|
static void onSave(void* userdata, BOOL close_after_save);
|
|
|
|
static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
|
|
LLAssetType::EType type,
|
|
void* user_data, S32 status, LLExtStat ext_status);
|
|
static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
|
|
static void onReset(void* userdata);
|
|
|
|
void loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type);
|
|
|
|
static void onErrorList(LLUICtrl*, void* user_data);
|
|
|
|
static void* createScriptEdPanel(void* userdata);
|
|
|
|
static void onMonoCheckboxClicked(LLUICtrl*, void* userdata);
|
|
|
|
static void receiveExperienceIds(const struct LLCoroResponder& responder, LLHandle<LLLiveLSLEditor> parent);
|
|
|
|
private:
|
|
bool mIsNew;
|
|
//LLUUID mTransmitID;
|
|
LLCheckBoxCtrl *mRunningCheckbox;
|
|
BOOL mAskedForRunningInfo;
|
|
BOOL mHaveRunningInfo;
|
|
LLButton *mResetButton;
|
|
LLPointer<LLViewerInventoryItem> mItem;
|
|
BOOL mCloseAfterSave;
|
|
// need to save both text and script, so need to decide when done
|
|
S32 mPendingUploads;
|
|
|
|
BOOL getIsModifiable() const { return mIsModifiable; } // Evaluated on load assert
|
|
|
|
LLCheckBoxCtrl* mMonoCheckbox;
|
|
BOOL mIsModifiable;
|
|
|
|
|
|
LLComboBox* mExperiences;
|
|
LLCheckBoxCtrl* mExperienceEnabled;
|
|
LLSD mExperienceIds;
|
|
|
|
LLHandle<LLFloater> mExperienceProfile;
|
|
};
|
|
|
|
#endif // LL_LLPREVIEWSCRIPT_H
|