diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
| commit | ac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch) | |
| tree | 0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/newview/lltexturectrl.h | |
| parent | 1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff) | |
| parent | cdb57cb299097b203581a6ef99840350831c321c (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index b1312d641f..3abe84dcc3 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -157,7 +157,7 @@ public: void closeDependentFloater(); void onFloaterClose(); - void onFloaterCommit(ETexturePickOp op); + void onFloaterCommit(ETexturePickOp op, LLUUID id = LLUUID::null); // This call is returned when a drag is detected. Your callback // should return TRUE if the drag is acceptable. |