From 3ee20531c96c05452a4b832634df000cf5d0dc08 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Mon, 8 Apr 2019 03:05:03 -0700 Subject: Added Copy/Paste to object properties in Build Tools --- indra/newview/llpanelobject.h | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 8829f493fa..c1e0367b53 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -66,6 +66,13 @@ public: static void onCommitPhantom( LLUICtrl* ctrl, void* userdata); static void onCommitPhysics( LLUICtrl* ctrl, void* userdata); + void onCopyPos(const LLSD& data); + void onPastePos(const LLSD& data); + void onCopySize(const LLSD& data); + void onPasteSize(const LLSD& data); + void onCopyRot(const LLSD& data); + void onPasteRot(const LLSD& data); + static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -157,7 +164,18 @@ protected: LLComboBox *mCtrlSculptType; LLCheckBoxCtrl *mCtrlSculptMirror; LLCheckBoxCtrl *mCtrlSculptInvert; - + + LLButton *mBtnCopyPos; + LLButton *mBtnPastePos; + LLButton *mBtnCopySize; + LLButton *mBtnPasteSize; + LLButton *mBtnCopyRot; + LLButton *mBtnPasteRot; + + LLVector3 mClipboardPos; + LLVector3 mClipboardSize; + LLVector3 mClipboardRot; + LLVector3 mCurEulerDegrees; // to avoid sending rotation when not changed BOOL mIsPhysical; // to avoid sending "physical" when not changed BOOL mIsTemporary; // to avoid sending "temporary" when not changed @@ -167,6 +185,10 @@ protected: LLUUID mSculptTextureRevert; // so we can revert the sculpt texture on cancel U8 mSculptTypeRevert; // so we can revert the sculpt type on cancel + BOOL mHasPosClipboard; + BOOL mHasSizeClipboard; + BOOL mHasRotClipboard; + LLPointer mObject; LLPointer mRootObject; }; -- cgit v1.2.3 From 3a27acca73ec340987a1379c92eba5a45cc236a6 Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Tue, 9 Apr 2019 00:12:04 -0700 Subject: Added Copy/Paste object parameters in Build Tools --- indra/newview/llpanelobject.h | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index c1e0367b53..46725a80e4 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -72,6 +72,8 @@ public: void onPasteSize(const LLSD& data); void onCopyRot(const LLSD& data); void onPasteRot(const LLSD& data); + void onCopyParams(const LLSD& data); + void onPasteParams(const LLSD& data); static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -154,6 +156,15 @@ protected: LLSpinCtrl* mCtrlRotY; LLSpinCtrl* mCtrlRotZ; + LLButton *mBtnCopyPos; + LLButton *mBtnPastePos; + LLButton *mBtnCopySize; + LLButton *mBtnPasteSize; + LLButton *mBtnCopyRot; + LLButton *mBtnPasteRot; + LLButton *mBtnCopyParams; + LLButton *mBtnPasteParams; + LLCheckBoxCtrl *mCheckLock; LLCheckBoxCtrl *mCheckPhysics; LLCheckBoxCtrl *mCheckTemporary; @@ -165,17 +176,6 @@ protected: LLCheckBoxCtrl *mCtrlSculptMirror; LLCheckBoxCtrl *mCtrlSculptInvert; - LLButton *mBtnCopyPos; - LLButton *mBtnPastePos; - LLButton *mBtnCopySize; - LLButton *mBtnPasteSize; - LLButton *mBtnCopyRot; - LLButton *mBtnPasteRot; - - LLVector3 mClipboardPos; - LLVector3 mClipboardSize; - LLVector3 mClipboardRot; - LLVector3 mCurEulerDegrees; // to avoid sending rotation when not changed BOOL mIsPhysical; // to avoid sending "physical" when not changed BOOL mIsTemporary; // to avoid sending "temporary" when not changed @@ -185,10 +185,21 @@ protected: LLUUID mSculptTextureRevert; // so we can revert the sculpt texture on cancel U8 mSculptTypeRevert; // so we can revert the sculpt type on cancel + LLVector3 mClipboardPos; + LLVector3 mClipboardSize; + LLVector3 mClipboardRot; + BOOL mHasPosClipboard; BOOL mHasSizeClipboard; BOOL mHasRotClipboard; + LLSD mParamsClipboard; + LLVolumeParams mClipboardVolumeParams; + BOOL mHasParamsClipboard; + BOOL mHasFlexiParam; + BOOL mHasSculptParam; + BOOL mHasLightParam; + LLPointer mObject; LLPointer mRootObject; }; -- cgit v1.2.3 From 41f5801aae25931b8e1a2db1b2eb9623efbc1f3e Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Tue, 16 Apr 2019 03:51:05 -0700 Subject: Added spotlight and phantom support to copy/paste Added paste options menu --- indra/newview/llpanelobject.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 46725a80e4..7fa728ea57 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -37,6 +37,7 @@ class LLCheckBoxCtrl; class LLTextBox; class LLUICtrl; class LLButton; +class LLMenuButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; @@ -84,6 +85,10 @@ public: BOOL onDropSculpt(LLInventoryItem* item); static void onCommitSculptType( LLUICtrl *ctrl, void* userdata); + bool pasteCheckMenuItem(const LLSD& userdata); + void pasteDoMenuItem(const LLSD& userdata); + bool pasteEnabletMenuItem(const LLSD& userdata); + protected: void getState(); @@ -97,6 +102,8 @@ protected: void sendSculpt(); void getVolumeParams(LLVolumeParams& volume_params); + + bool canCopyTexture(LLUUID image_id); protected: // Per-object options @@ -164,6 +171,7 @@ protected: LLButton *mBtnPasteRot; LLButton *mBtnCopyParams; LLButton *mBtnPasteParams; + LLMenuButton *mBtnPasteMenu; LLCheckBoxCtrl *mCheckLock; LLCheckBoxCtrl *mCheckPhysics; @@ -196,9 +204,10 @@ protected: LLSD mParamsClipboard; LLVolumeParams mClipboardVolumeParams; BOOL mHasParamsClipboard; - BOOL mHasFlexiParam; - BOOL mHasSculptParam; - BOOL mHasLightParam; + + BOOL mPasteParametric; + BOOL mPastePhysics; + BOOL mPasteLight; LLPointer mObject; LLPointer mRootObject; -- cgit v1.2.3 From 733f799c4359d32778b5f345ae434152467334bc Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Fri, 6 Sep 2019 20:46:23 -0700 Subject: Cleanup object copy/paste functions --- indra/newview/llpanelobject.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 7fa728ea57..7161f51c73 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -67,14 +67,14 @@ public: static void onCommitPhantom( LLUICtrl* ctrl, void* userdata); static void onCommitPhysics( LLUICtrl* ctrl, void* userdata); - void onCopyPos(const LLSD& data); - void onPastePos(const LLSD& data); - void onCopySize(const LLSD& data); - void onPasteSize(const LLSD& data); - void onCopyRot(const LLSD& data); - void onPasteRot(const LLSD& data); - void onCopyParams(const LLSD& data); - void onPasteParams(const LLSD& data); + void onCopyPos(); + void onPastePos(); + void onCopySize(); + void onPasteSize(); + void onCopyRot(); + void onPasteRot(); + void onCopyParams(); + void onPasteParams(); static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -88,6 +88,7 @@ public: bool pasteCheckMenuItem(const LLSD& userdata); void pasteDoMenuItem(const LLSD& userdata); bool pasteEnabletMenuItem(const LLSD& userdata); + static bool canCopyTexture(LLUUID image_id); protected: void getState(); @@ -102,8 +103,6 @@ protected: void sendSculpt(); void getVolumeParams(LLVolumeParams& volume_params); - - bool canCopyTexture(LLUUID image_id); protected: // Per-object options -- cgit v1.2.3 From aec6caf5eb89d8cc5ce37a8d59d2a57a3e745320 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 8 Nov 2019 21:11:48 +0200 Subject: SL-12241 Separated 'flexible' paramenters --- indra/newview/llpanelobject.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 7161f51c73..0c37e837ad 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -205,6 +205,7 @@ protected: BOOL mHasParamsClipboard; BOOL mPasteParametric; + BOOL mPasteFlexible; BOOL mPastePhysics; BOOL mPasteLight; -- cgit v1.2.3 From eaa4e977d687abbfb28687c66cb0b92e66deb484 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 11 Dec 2019 22:48:46 +0200 Subject: SL-12334 [Copypaste] Texture is not copied to clipboard from a full-perms object --- indra/newview/llpanelobject.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 0c37e837ad..65f46a8ed3 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -88,6 +88,12 @@ public: bool pasteCheckMenuItem(const LLSD& userdata); void pasteDoMenuItem(const LLSD& userdata); bool pasteEnabletMenuItem(const LLSD& userdata); + static bool isLibraryTexture(LLUUID image_id); + + // Finds copy-enabled texture with specified asset from inventory + // This can be performance unfriendly and doesn't warranty that + // the texture is original source of asset + static LLUUID getCopyPermInventoryTextureId(LLUUID image_id); static bool canCopyTexture(LLUUID image_id); protected: -- cgit v1.2.3 From 090bb3e6de6d5cb70ed372748a76e391f61cb32e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 2 Jun 2020 15:27:34 +0300 Subject: SL-13359 #1 Revert floater_tools and object panel changes --- indra/newview/llpanelobject.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 65f46a8ed3..e9b9254a78 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -37,7 +37,6 @@ class LLCheckBoxCtrl; class LLTextBox; class LLUICtrl; class LLButton; -class LLMenuButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; @@ -73,9 +72,6 @@ public: void onPasteSize(); void onCopyRot(); void onPasteRot(); - void onCopyParams(); - void onPasteParams(); - static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -85,17 +81,6 @@ public: BOOL onDropSculpt(LLInventoryItem* item); static void onCommitSculptType( LLUICtrl *ctrl, void* userdata); - bool pasteCheckMenuItem(const LLSD& userdata); - void pasteDoMenuItem(const LLSD& userdata); - bool pasteEnabletMenuItem(const LLSD& userdata); - static bool isLibraryTexture(LLUUID image_id); - - // Finds copy-enabled texture with specified asset from inventory - // This can be performance unfriendly and doesn't warranty that - // the texture is original source of asset - static LLUUID getCopyPermInventoryTextureId(LLUUID image_id); - static bool canCopyTexture(LLUUID image_id); - protected: void getState(); @@ -168,16 +153,6 @@ protected: LLSpinCtrl* mCtrlRotY; LLSpinCtrl* mCtrlRotZ; - LLButton *mBtnCopyPos; - LLButton *mBtnPastePos; - LLButton *mBtnCopySize; - LLButton *mBtnPasteSize; - LLButton *mBtnCopyRot; - LLButton *mBtnPasteRot; - LLButton *mBtnCopyParams; - LLButton *mBtnPasteParams; - LLMenuButton *mBtnPasteMenu; - LLCheckBoxCtrl *mCheckLock; LLCheckBoxCtrl *mCheckPhysics; LLCheckBoxCtrl *mCheckTemporary; @@ -206,15 +181,6 @@ protected: BOOL mHasSizeClipboard; BOOL mHasRotClipboard; - LLSD mParamsClipboard; - LLVolumeParams mClipboardVolumeParams; - BOOL mHasParamsClipboard; - - BOOL mPasteParametric; - BOOL mPasteFlexible; - BOOL mPastePhysics; - BOOL mPasteLight; - LLPointer mObject; LLPointer mRootObject; }; -- cgit v1.2.3 From f363646eb71d58007fc4936a67ad9c7bde9b93ac Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 2 Jun 2020 21:53:28 +0300 Subject: SL-13359 #2 UI changes for panel object todo: new icons, separator and some repositioning --- indra/newview/llpanelobject.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index e9b9254a78..e8f8d0eb9a 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -37,6 +37,7 @@ class LLCheckBoxCtrl; class LLTextBox; class LLUICtrl; class LLButton; +class LLMenuButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; @@ -81,6 +82,9 @@ public: BOOL onDropSculpt(LLInventoryItem* item); static void onCommitSculptType( LLUICtrl *ctrl, void* userdata); + void menuDoToSelected(const LLSD& userdata); + bool menuEnableItem(const LLSD& userdata); + protected: void getState(); @@ -137,17 +141,20 @@ protected: LLTextBox* mLabelRevolutions; LLSpinCtrl* mSpinRevolutions; + LLMenuButton* mMenuPastePos; LLTextBox* mLabelPosition; LLSpinCtrl* mCtrlPosX; LLSpinCtrl* mCtrlPosY; LLSpinCtrl* mCtrlPosZ; + LLMenuButton* mMenuPasteSize; LLTextBox* mLabelSize; LLSpinCtrl* mCtrlScaleX; LLSpinCtrl* mCtrlScaleY; LLSpinCtrl* mCtrlScaleZ; BOOL mSizeChanged; + LLMenuButton* mMenuPasteRot; LLTextBox* mLabelRotation; LLSpinCtrl* mCtrlRotX; LLSpinCtrl* mCtrlRotY; -- cgit v1.2.3 From 30f1038351734b946be9a6f910e4e0eca82be1d4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 3 Jun 2020 16:12:11 +0300 Subject: SL-13359 #3 UI changes for panel object --- indra/newview/llpanelobject.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index e8f8d0eb9a..764c0d8af4 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -141,20 +141,20 @@ protected: LLTextBox* mLabelRevolutions; LLSpinCtrl* mSpinRevolutions; - LLMenuButton* mMenuPastePos; + LLMenuButton* mMenuClipboardPos; LLTextBox* mLabelPosition; LLSpinCtrl* mCtrlPosX; LLSpinCtrl* mCtrlPosY; LLSpinCtrl* mCtrlPosZ; - LLMenuButton* mMenuPasteSize; + LLMenuButton* mMenuClipboardSize; LLTextBox* mLabelSize; LLSpinCtrl* mCtrlScaleX; LLSpinCtrl* mCtrlScaleY; LLSpinCtrl* mCtrlScaleZ; BOOL mSizeChanged; - LLMenuButton* mMenuPasteRot; + LLMenuButton* mMenuClipboardRot; LLTextBox* mLabelRotation; LLSpinCtrl* mCtrlRotX; LLSpinCtrl* mCtrlRotY; -- cgit v1.2.3 From 1310fac3b10b3927cb502008c156c16631b97663 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 17 Jun 2020 23:38:55 +0300 Subject: SL-13359 #5 Implemented revised changes --- indra/newview/llpanelobject.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 764c0d8af4..5ea3d07699 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -73,6 +73,8 @@ public: void onPasteSize(); void onCopyRot(); void onPasteRot(); + void onCopyParams(); + void onPasteParams(); static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -102,6 +104,7 @@ protected: protected: // Per-object options LLComboBox* mComboBaseType; + LLMenuButton* mMenuClipboardParams; LLTextBox* mLabelCut; LLSpinCtrl* mSpinCutBegin; @@ -183,10 +186,12 @@ protected: LLVector3 mClipboardPos; LLVector3 mClipboardSize; LLVector3 mClipboardRot; + LLSD mClipboardParams; - BOOL mHasPosClipboard; - BOOL mHasSizeClipboard; - BOOL mHasRotClipboard; + bool mHasClipboardPos; + bool mHasClipboardSize; + bool mHasClipboardRot; + bool mHasClipboardParams; LLPointer mObject; LLPointer mRootObject; -- cgit v1.2.3 From d95f86c5931db5b025e0923071c9b3a08bb25301 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 18 Jun 2020 22:38:58 +0300 Subject: SL-13359 #7 Features tab --- indra/newview/llpanelobject.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanelobject.h') diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 5ea3d07699..515dd27c0a 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -191,7 +191,6 @@ protected: bool mHasClipboardPos; bool mHasClipboardSize; bool mHasClipboardRot; - bool mHasClipboardParams; LLPointer mObject; LLPointer mRootObject; -- cgit v1.2.3