Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable wearable export

Browse Source
This commit is contained in:
Lirusaito
2019-02-28 20:17:33 -05:00
parent 8e18f2ab43
commit 9630632120
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatercustomize.cpp
View File

@@ -503,7 +503,6 @@ void LLFloaterCustomize::onBtnExport()
//static //static
void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable, AIFilePicker* filepicker) void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable, AIFilePicker* filepicker)
{ {
#if 0
if (!filepicker->hasFilename()) if (!filepicker->hasFilename())
{ {
// User canceled export. // User canceled export.
@@ -529,7 +528,6 @@ void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable,
{ {
AIAlert::add_modal("AIXMLExportSuccess", AIArgs("[FILE]", filename)); AIAlert::add_modal("AIXMLExportSuccess", AIArgs("[FILE]", filename));
} }
#endif
} }
void LLFloaterCustomize::onBtnOk() void LLFloaterCustomize::onBtnOk()

7
indra/newview/llviewerwearable.cpp
View File

@@ -42,6 +42,7 @@
#include "llinventoryfunctions.h" #include "llinventoryfunctions.h"
#include "lllocaltextureobject.h" #include "lllocaltextureobject.h"
#include "llpaneleditwearable.h" #include "llpaneleditwearable.h"
#include "aixmllindengenepool.h"
using namespace LLAvatarAppearanceDefines; using namespace LLAvatarAppearanceDefines;
@@ -135,8 +136,8 @@ LLWearable::EImportResult LLViewerWearable::importStream( std::istream& input_st
return result; return result;
} }
#if 0
AIArchetype LLViewerWearable::getArchetype(void) const AIArchetype LLViewerWearable::getArchetype() const
{ {
AIArchetype archetype(this); AIArchetype archetype(this);
for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); ++iter) for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); ++iter)
@@ -149,7 +150,7 @@ AIArchetype LLViewerWearable::getArchetype(void) const
} }
return archetype; return archetype;
} }
#endif
// Avatar parameter and texture definitions can change over time. // Avatar parameter and texture definitions can change over time.
// This function returns true if parameters or textures have been added or removed // This function returns true if parameters or textures have been added or removed
// since this wearable was created. // since this wearable was created.

4
indra/newview/llviewerwearable.h
View File

@@ -68,9 +68,7 @@ public:
/*virtual*/ EImportResult importStream( std::istream& input_stream, LLAvatarAppearance* avatarp ); /*virtual*/ EImportResult importStream( std::istream& input_stream, LLAvatarAppearance* avatarp );
// Singu extension. // Singu extension.
#if 0 class AIArchetype getArchetype() const;
AIArchetype getArchetype(void) const;
#endif
void setParamsToDefaults(); void setParamsToDefaults();
void setTexturesToDefaults(); void setTexturesToDefaults();