diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/llfloaterimagepreview.h | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Diffstat (limited to 'indra/newview/llfloaterimagepreview.h')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h index e639544f48..6a4de3d3cc 100644 --- a/indra/newview/llfloaterimagepreview.h +++ b/indra/newview/llfloaterimagepreview.h @@ -81,6 +81,7 @@ public: void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male); void setTexture(U32 name) { mTextureName = name; } + void clearPreviewTexture(const std::string& mesh_name); BOOL render(); void refresh(); @@ -118,6 +119,8 @@ public: static void onMouseCaptureLostImagePreview(LLMouseHandler*); static void setUploadAmount(S32 amount) { sUploadAmount = amount; } + void clearAllPreviewTextures(); + protected: static void onPreviewTypeCommit(LLUICtrl*,void*); void draw(); |