A Massive Experience Tools (and Unstable Branch) Merge
[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
This commit is contained in:
Inusaito Sayori
committed by
Liru Færs
Liru Færs
parent
9a53824d6d
commit
36b75b2398
@@ -81,8 +81,8 @@ public:
|
||||
|
||||
void initMenu();
|
||||
|
||||
virtual void draw();
|
||||
/*virtual*/ BOOL postBuild();
|
||||
void draw() override;
|
||||
BOOL postBuild() override;
|
||||
BOOL canClose();
|
||||
void setEnableEditing(bool enable);
|
||||
|
||||
@@ -104,7 +104,6 @@ public:
|
||||
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*);
|
||||
@@ -127,7 +126,9 @@ public:
|
||||
static BOOL enableSelectAllMenu(void* userdata);
|
||||
static BOOL enableDeselectMenu(void* userdata);
|
||||
|
||||
virtual bool hasAccelerators() const { return true; }
|
||||
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);
|
||||
@@ -139,7 +140,7 @@ private:
|
||||
|
||||
void selectFirstError();
|
||||
|
||||
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
||||
BOOL handleKeyHere(KEY key, MASK mask) override;
|
||||
|
||||
void enableSave(BOOL b) {mEnableSave = b;}
|
||||
|
||||
@@ -169,6 +170,7 @@ private:
|
||||
BOOL mEnableSave;
|
||||
BOOL mHasScriptData;
|
||||
LLLiveLSLFile* mLiveFile;
|
||||
LLUUID mAssociatedExperience;
|
||||
|
||||
LLScriptEdContainer* mContainer; // parent view
|
||||
|
||||
@@ -194,41 +196,37 @@ protected:
|
||||
bool onExternalChange(const std::string& filename);
|
||||
virtual void saveIfNeeded(bool sync = true) = 0;
|
||||
|
||||
LLTextEditor* getEditor() { return mScriptEd->mEditor; }
|
||||
/*virtual*/ const char *getTitleName() const { return "Script"; }
|
||||
LLTextEditor* getEditor() const { return mScriptEd->mEditor; }
|
||||
/*virtual*/ const char *getTitleName() const override { return "Script"; }
|
||||
// <edit>
|
||||
/*virtual*/ BOOL canSaveAs() const;
|
||||
/*virtual*/ void saveAs();
|
||||
/*virtual*/ BOOL canSaveAs() const override;
|
||||
/*virtual*/ void saveAs() override;
|
||||
void saveAs_continued(AIFilePicker* filepicker);
|
||||
// </edit>
|
||||
|
||||
LLScriptEdCore* mScriptEd;
|
||||
};
|
||||
|
||||
// Used to view and edit a LSL from your inventory.
|
||||
class LLPreviewLSL : public LLScriptEdContainer
|
||||
// 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();
|
||||
/*virtual*/ BOOL postBuild() override;
|
||||
|
||||
|
||||
protected:
|
||||
virtual BOOL canClose();
|
||||
BOOL canClose() override;
|
||||
void closeIfNeeded();
|
||||
|
||||
virtual void loadAsset();
|
||||
/*virtual*/ void saveIfNeeded(bool sync = true);
|
||||
void loadAsset() override;
|
||||
/*virtual*/ void saveIfNeeded(bool sync = true) override;
|
||||
void uploadAssetViaCaps(const std::string& url,
|
||||
const std::string& filename,
|
||||
const LLUUID& item_id);
|
||||
#if 0 //Client side compiling disabled.
|
||||
void uploadAssetLegacy(const std::string& filename,
|
||||
const LLUUID& item_id,
|
||||
const LLTransactionID& tid);
|
||||
#endif
|
||||
|
||||
static void onSearchReplace(void* userdata);
|
||||
static void onLoad(void* userdata);
|
||||
@@ -237,10 +235,6 @@ protected:
|
||||
static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
|
||||
LLAssetType::EType type,
|
||||
void* user_data, S32 status, LLExtStat ext_status);
|
||||
#if 0 //Client side compiling disabled.
|
||||
static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
|
||||
static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
static void* createScriptEdPanel(void* userdata);
|
||||
@@ -254,8 +248,8 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
// Used to view and edit an LSL that is attached to an object.
|
||||
class LLLiveLSLEditor : public LLScriptEdContainer
|
||||
// Used to view and edit an LSL script that is attached to an object.
|
||||
class LLLiveLSLEditor final : public LLScriptEdContainer
|
||||
{
|
||||
friend class LLLiveLSLFile;
|
||||
public:
|
||||
@@ -269,29 +263,35 @@ public:
|
||||
bool is_script_running);
|
||||
virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
|
||||
|
||||
/*virtual*/ BOOL postBuild();
|
||||
/*virtual*/ BOOL postBuild() override;
|
||||
|
||||
void setIsNew() { mIsNew = TRUE; }
|
||||
|
||||
private:
|
||||
virtual BOOL canClose();
|
||||
void closeIfNeeded();
|
||||
virtual void draw();
|
||||
static void setAssociatedExperience(LLHandle<LLLiveLSLEditor> editor, const LLSD& experience);
|
||||
static void onToggleExperience(LLUICtrl* ui, void* userdata);
|
||||
static void onViewProfile(LLUICtrl* ui, void* userdata);
|
||||
|
||||
virtual void loadAsset();
|
||||
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);
|
||||
/*virtual*/ void saveIfNeeded(bool sync = true) override;
|
||||
void uploadAssetViaCaps(const std::string& url,
|
||||
const std::string& filename,
|
||||
const std::string& filename,
|
||||
const LLUUID& task_id,
|
||||
const LLUUID& item_id,
|
||||
BOOL is_running);
|
||||
#if 0 //Client side compiling disabled.
|
||||
void uploadAssetLegacy(const std::string& filename,
|
||||
LLViewerObject* object,
|
||||
const LLTransactionID& tid,
|
||||
BOOL is_running);
|
||||
#endif
|
||||
BOOL is_running,
|
||||
const LLUUID& experience_public_id);
|
||||
BOOL monoChecked() const;
|
||||
|
||||
|
||||
@@ -302,10 +302,6 @@ private:
|
||||
static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
|
||||
LLAssetType::EType type,
|
||||
void* user_data, S32 status, LLExtStat ext_status);
|
||||
#if 0 //Client side compiling disabled.
|
||||
static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
|
||||
static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
|
||||
#endif
|
||||
static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
|
||||
static void onReset(void* userdata);
|
||||
|
||||
@@ -317,6 +313,8 @@ private:
|
||||
|
||||
static void onMonoCheckboxClicked(LLUICtrl*, void* userdata);
|
||||
|
||||
static void receiveExperienceIds(const struct LLCoroResponder& responder, LLHandle<LLLiveLSLEditor> parent);
|
||||
|
||||
private:
|
||||
bool mIsNew;
|
||||
//LLUUID mTransmitID;
|
||||
@@ -330,9 +328,16 @@ private:
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user