From 2beb9c1903bc4164fe9e57c4a2eb1cc42d413ef4 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 1 Feb 2012 17:40:16 -0800 Subject: PATH-198: Laid out the pathfinding buttons per Leo's design. Functionality is currently hooked up to stubs that report a warning message about lack of implementation. --- indra/newview/llpanelvolume.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llpanelvolume.h') diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 0ef47db0d9..ae66414b0f 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -40,6 +40,7 @@ class LLButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; +class LLRadioGroup; class LLPanelVolume : public LLPanel { @@ -84,6 +85,8 @@ protected: void sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata); void sendPhysicsDensity(LLUICtrl* ctrl, void* userdata); + void sendPathfindingType(); + /* LLTextBox* mLabelSelectSingleMessage; // Light @@ -118,6 +121,8 @@ protected: LLSpinCtrl* mSpinPhysicsFriction; LLSpinCtrl* mSpinPhysicsDensity; LLSpinCtrl* mSpinPhysicsRestitution; + + LLRadioGroup* mPathfindingType; }; #endif -- cgit v1.2.3 From 942c17224d5f299950abc1fbb83d1528c50b3ab2 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 15 Feb 2012 17:09:10 -0800 Subject: Backing out changeset: dda75e2e00e5 --- indra/newview/llpanelvolume.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llpanelvolume.h') diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index ae66414b0f..0ef47db0d9 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -40,7 +40,6 @@ class LLButton; class LLViewerObject; class LLComboBox; class LLColorSwatchCtrl; -class LLRadioGroup; class LLPanelVolume : public LLPanel { @@ -85,8 +84,6 @@ protected: void sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata); void sendPhysicsDensity(LLUICtrl* ctrl, void* userdata); - void sendPathfindingType(); - /* LLTextBox* mLabelSelectSingleMessage; // Light @@ -121,8 +118,6 @@ protected: LLSpinCtrl* mSpinPhysicsFriction; LLSpinCtrl* mSpinPhysicsDensity; LLSpinCtrl* mSpinPhysicsRestitution; - - LLRadioGroup* mPathfindingType; }; #endif -- cgit v1.2.3 From 081977308d6576f100df4bda03e6928faf520bc5 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 3 Apr 2012 18:41:31 -0700 Subject: PATH-454: BUGFIX Adding a notification when switching a permanent object to Flexible Path. --- indra/newview/llpanelvolume.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelvolume.h') diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h index 0ef47db0d9..deb6b6f2a6 100644 --- a/indra/newview/llpanelvolume.h +++ b/indra/newview/llpanelvolume.h @@ -61,7 +61,7 @@ public: static void onCommitIsLight( LLUICtrl* ctrl, void* userdata); static void onCommitLight( LLUICtrl* ctrl, void* userdata); - static void onCommitIsFlexible( LLUICtrl* ctrl, void* userdata); + void onCommitIsFlexible( LLUICtrl* ctrl, void* userdata); static void onCommitFlexible( LLUICtrl* ctrl, void* userdata); static void onCommitPhysicsParam( LLUICtrl* ctrl, void* userdata); static void onCommitMaterial( LLUICtrl* ctrl, void* userdata); @@ -84,6 +84,8 @@ protected: void sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata); void sendPhysicsDensity(LLUICtrl* ctrl, void* userdata); + void handleResponseChangeToFlexible(const LLSD &pNotification, const LLSD &pResponse); + /* LLTextBox* mLabelSelectSingleMessage; // Light -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/llpanelvolume.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/llpanelvolume.h (limited to 'indra/newview/llpanelvolume.h') diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h old mode 100644 new mode 100755 -- cgit v1.2.3