diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-06 19:02:39 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-06 19:02:39 -0400 |
| commit | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (patch) | |
| tree | 9a2f099990176fad11c8904bfc7830f6e830a8f6 /indra/newview/llpanelvolume.h | |
| parent | b12ade128ba2a7f1a10b283abcfa12bfb15f06d3 (diff) | |
| parent | 84884b06f206790ab5a4f52c7125665f9d32b7d8 (diff) | |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'indra/newview/llpanelvolume.h')
| -rw-r--r-- | indra/newview/llpanelvolume.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |