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

v-d llviewermenufile.cpp functions (and order) for meshupload, decide when Upload Mesh entry should be enabled.

Browse Source
This commit is contained in:
Lirusaito
2013-01-07 18:08:42 -05:00
parent cbbe678f9e
commit 1b2c0ba02b
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
indra/newview/llviewermenufile.cpp
View File

@@ -120,6 +120,14 @@ class LLFileEnableUpload : public view_listener_t
} }
}; };
class LLFileEnableUploadModel : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
return gMeshRepo.meshUploadEnabled();
}
};
//============================================================================ //============================================================================
#if LL_WINDOWS #if LL_WINDOWS
@@ -302,6 +310,27 @@ class LLFileUploadImage : public view_listener_t, public AIFileUpload
} }
}; };
class LLFileUploadModel : public view_listener_t, public AIFileUpload
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
start_filepicker(FFLOAD_COLLADA, "dae");
return true;
}
protected:
// Inherited from AIFileUpload.
/*virtual*/ void handle_event(std::string const& filename)
{
LLFloaterModelPreview* fmp = new LLFloaterModelPreview(filename);
LLUICtrlFactory::getInstance()->buildFloater(fmp, "floater_model_preview.xml");
if (fmp)
{
fmp->loadModel(3);
}
}
};
class LLFileUploadSound : public view_listener_t, public AIFileUpload class LLFileUploadSound : public view_listener_t, public AIFileUpload
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -337,23 +366,6 @@ class LLFileUploadAnim : public view_listener_t, public AIFileUpload
} }
}; };
class LLFileUploadMesh : public view_listener_t, public AIFileUpload
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
start_filepicker(FFLOAD_COLLADA, "dae");
return true;
}
protected:
// Inherited from AIFileUpload.
/*virtual*/ void handle_event(std::string const& filename)
{
LLFloaterModelPreview* floaterp = new LLFloaterModelPreview(filename);
LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_model_preview.xml");
}
};
class LLFileUploadBulk : public view_listener_t class LLFileUploadBulk : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -1341,7 +1353,7 @@ void init_menu_file()
(new LLFileUploadImage())->registerListener(gMenuHolder, "File.UploadImage"); (new LLFileUploadImage())->registerListener(gMenuHolder, "File.UploadImage");
(new LLFileUploadSound())->registerListener(gMenuHolder, "File.UploadSound"); (new LLFileUploadSound())->registerListener(gMenuHolder, "File.UploadSound");
(new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim"); (new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim");
(new LLFileUploadMesh())->registerListener(gMenuHolder, "File.UploadMesh"); (new LLFileUploadModel())->registerListener(gMenuHolder, "File.UploadModel");
(new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk"); (new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk");
(new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow"); (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
(new LLFileCloseAllWindows())->registerListener(gMenuHolder, "File.CloseAllWindows"); (new LLFileCloseAllWindows())->registerListener(gMenuHolder, "File.CloseAllWindows");
@@ -1357,6 +1369,8 @@ void init_menu_file()
(new LLFileQuit())->registerListener(gMenuHolder, "File.Quit"); (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
(new LLFileLogOut())->registerListener(gMenuHolder, "File.LogOut"); (new LLFileLogOut())->registerListener(gMenuHolder, "File.LogOut");
(new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload"); (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");
(new LLFileEnableUploadModel()->registerListener(gMenuHolder, "File.EnableUploadModel");
(new LLFileEnableSaveAs())->registerListener(gMenuHolder, "File.EnableSaveAs"); (new LLFileEnableSaveAs())->registerListener(gMenuHolder, "File.EnableSaveAs");
} }

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -22,8 +22,8 @@
</menu_item_call> </menu_item_call>
<menu_item_call label="Upload Mesh..." name="Upload Mesh" <menu_item_call label="Upload Mesh..." name="Upload Mesh"
mouse_opaque="true" enabled="true" > mouse_opaque="true" enabled="true" >
<on_click function="File.UploadMesh" userdata="" /> <on_click function="File.UploadModel" userdata="" />
<on_enable function="File.EnableUpload" /> <on_enable function="File.EnableUploadModel" />
</menu_item_call> </menu_item_call>
<menu_item_call label="Bulk ([UPLOADFEE] per file)..." name="Bulk Upload" <menu_item_call label="Bulk ([UPLOADFEE] per file)..." name="Bulk Upload"
mouse_opaque="true" enabled="true" > mouse_opaque="true" enabled="true" >