diff options
| author | McCabe Maxsted | 2010-08-25 08:18:10 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 05:01:41 -0700 |
| commit | f248ce248c8ac0f75fd0219542f4c329204d00f4 (patch) | |
| tree | f71b916f7da180d739c82ff6324304f41b6e7df2 /linden/indra/newview/lltexturectrl.h | |
| parent | Made disable max build constraints also disable max position spinner values (diff) | |
| download | meta-impy-f248ce248c8ac0f75fd0219542f4c329204d00f4.zip meta-impy-f248ce248c8ac0f75fd0219542f4c329204d00f4.tar.gz meta-impy-f248ce248c8ac0f75fd0219542f4c329204d00f4.tar.bz2 meta-impy-f248ce248c8ac0f75fd0219542f4c329204d00f4.tar.xz | |
Ported local textures from Emerald (requires boost filesystem and system libs to work)
Diffstat (limited to 'linden/indra/newview/lltexturectrl.h')
| -rw-r--r-- | linden/indra/newview/lltexturectrl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/lltexturectrl.h b/linden/indra/newview/lltexturectrl.h index dccdbc5..27ac1e1 100644 --- a/linden/indra/newview/lltexturectrl.h +++ b/linden/indra/newview/lltexturectrl.h | |||
| @@ -140,6 +140,7 @@ public: | |||
| 140 | 140 | ||
| 141 | void onFloaterClose(); | 141 | void onFloaterClose(); |
| 142 | void onFloaterCommit(ETexturePickOp op); | 142 | void onFloaterCommit(ETexturePickOp op); |
| 143 | void onFloaterCommit(ETexturePickOp op, LLUUID id); // tag: vaa emerald local_asset_browser | ||
| 143 | 144 | ||
| 144 | // This call is returned when a drag is detected. Your callback | 145 | // This call is returned when a drag is detected. Your callback |
| 145 | // should return TRUE if the drag is acceptable. | 146 | // should return TRUE if the drag is acceptable. |