diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-12 17:39:08 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-12 17:39:08 -0500 |
commit | 93696ac019865898d35d37d1e32d7a4b819a0c93 (patch) | |
tree | afac704c0d5ad56c0bc2ed603e6f0bb15f525431 /indra/newview/llpanelobject.h | |
parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
parent | 4911586023144bd10d6a91f3f1be1e65af0c706d (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelobject.h')
-rw-r--r-- | indra/newview/llpanelobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index e07bf007ec..e2f2a4400d 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -62,14 +62,14 @@ public: static void onCommitPosition( LLUICtrl* ctrl, void* userdata); static void onCommitScale( LLUICtrl* ctrl, void* userdata); static void onCommitRotation( LLUICtrl* ctrl, void* userdata); - static void onCommitPhysics( LLUICtrl* ctrl, void* userdata); static void onCommitTemporary( LLUICtrl* ctrl, void* userdata); static void onCommitPhantom( LLUICtrl* ctrl, void* userdata); static void onCommitCastShadows( LLUICtrl* ctrl, void* userdata); + static void onCommitPhysics( LLUICtrl* ctrl, void* userdata); + static void onCommitMaterial( LLUICtrl* ctrl, void* userdata); static void onCommitParametric(LLUICtrl* ctrl, void* userdata); - static void onCommitMaterial( LLUICtrl* ctrl, void* userdata); void onCommitSculpt(const LLSD& data); void onCancelSculpt(const LLSD& data); @@ -87,6 +87,7 @@ protected: void sendIsPhysical(); void sendIsTemporary(); void sendIsPhantom(); + void sendCastShadows(); void sendSculpt(); |