diff options
| author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
| commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
| tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llpanelface.h | |
| parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
| parent | 82ae214f6a367e17dd335e80e2444cf672108821 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rwxr-xr-x | indra/newview/llpanelface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index e32f039921..9823e84cd9 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -143,7 +143,9 @@ protected: void onCommitShinyColor(const LLSD& data); void onCommitAlpha(const LLSD& data); void onCancelColor(const LLSD& data); + void onCancelShinyColor(const LLSD& data); void onSelectColor(const LLSD& data); + void onSelectShinyColor(const LLSD& data); void onCloseTexturePicker(const LLSD& data); |