diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
| commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
| tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/newview/lltexturectrl.h | |
| parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
| parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) | |
Merge pull from vir/drano
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. |