From 37b612d515d843270c430baf787f2dcfa2506b81 Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Tue, 27 Jul 2010 00:00:44 +0000 Subject: [PATCH] fix build under *nix --- indra/newview/llpreviewnotecard.cpp | 232 ++++++++++++++-------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index 3d4231c8e..b97a2e09b 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -60,8 +60,8 @@ #include "llappviewer.h" // app_abort_quit() #include "lllineeditor.h" #include "lluictrlfactory.h" -// -#include "llfilepicker.h" +// +#include "llfilepicker.h" // ///---------------------------------------------------------------------------- @@ -111,8 +111,8 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, { LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml"); childSetAction("Save",onClickSave,this); - // - childSetAction("Get Items", onClickGetItems, this); + // + childSetAction("Get Items", onClickGetItems, this); // if( mAssetID.isNull() ) @@ -341,8 +341,8 @@ void LLPreviewNotecard::loadAsset() GP_OBJECT_MANIPULATE)) { editor->setEnabled(FALSE); - // You can always save in task inventory - if(!mObjectUUID.isNull()) editor->setEnabled(TRUE); + // You can always save in task inventory + if(!mObjectUUID.isNull()) editor->setEnabled(TRUE); // childSetVisible("lock", TRUE); } @@ -451,50 +451,50 @@ void LLPreviewNotecard::onClickSave(void* user_data) preview->saveIfNeeded(); } } -// -// static -void LLPreviewNotecard::onClickGetItems(void* user_data) -{ - LLPreviewNotecard* preview = (LLPreviewNotecard*)user_data; - if(preview) - { - LLViewerTextEditor* editor = preview->getChild("Notecard Editor"); - if(editor) - { - std::vector> items = editor->getEmbeddedItems(); - if(items.size()) - { - const BOOL use_caps = FALSE; - - std::vector>::iterator iter = items.begin(); - std::vector>::iterator end = items.end(); - for( ; iter != end; ++iter) - { - LLInventoryItem* item = static_cast(*iter); - if(use_caps) - { - copy_inventory_from_notecard(preview->getObjectID(), preview->getNotecardItemID(), item, 0); - } - else - { - // Only one item per message actually works - gMessageSystem->newMessageFast(_PREHASH_CopyInventoryFromNotecard); - gMessageSystem->nextBlockFast(_PREHASH_AgentData); - gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); - gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); - gMessageSystem->nextBlockFast(_PREHASH_NotecardData); - gMessageSystem->addUUIDFast(_PREHASH_NotecardItemID, preview->getNotecardItemID()); - gMessageSystem->addUUIDFast(_PREHASH_ObjectID, preview->getObjectID()); - gMessageSystem->nextBlockFast(_PREHASH_InventoryData); - gMessageSystem->addUUIDFast(_PREHASH_ItemID, item->getUUID()); - gMessageSystem->addUUIDFast(_PREHASH_FolderID, gInventory.findCategoryUUIDForType(item->getType())); - gAgent.sendReliableMessage(); - } - } - } - } - } -} +// +// static +void LLPreviewNotecard::onClickGetItems(void* user_data) +{ + LLPreviewNotecard* preview = (LLPreviewNotecard*)user_data; + if(preview) + { + LLViewerTextEditor* editor = preview->getChild("Notecard Editor"); + if(editor) + { + std::vector > items = editor->getEmbeddedItems(); + if(items.size()) + { + const BOOL use_caps = FALSE; + + std::vector >::iterator iter = items.begin(); + std::vector >::iterator end = items.end(); + for( ; iter != end; ++iter) + { + LLInventoryItem* item = static_cast(*iter); + if(use_caps) + { + copy_inventory_from_notecard(preview->getObjectID(), preview->getNotecardItemID(), item, 0); + } + else + { + // Only one item per message actually works + gMessageSystem->newMessageFast(_PREHASH_CopyInventoryFromNotecard); + gMessageSystem->nextBlockFast(_PREHASH_AgentData); + gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); + gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + gMessageSystem->nextBlockFast(_PREHASH_NotecardData); + gMessageSystem->addUUIDFast(_PREHASH_NotecardItemID, preview->getNotecardItemID()); + gMessageSystem->addUUIDFast(_PREHASH_ObjectID, preview->getObjectID()); + gMessageSystem->nextBlockFast(_PREHASH_InventoryData); + gMessageSystem->addUUIDFast(_PREHASH_ItemID, item->getUUID()); + gMessageSystem->addUUIDFast(_PREHASH_FolderID, gInventory.findCategoryUUIDForType(item->getType())); + gAgent.sendReliableMessage(); + } + } + } + } + } +} // struct LLSaveNotecardInfo { @@ -702,69 +702,69 @@ void LLPreviewNotecard::reshape(S32 width, S32 height, BOOL called_from_parent) } } -// -// virtual -BOOL LLPreviewNotecard::canSaveAs() const -{ - return TRUE; -} - -// virtual -void LLPreviewNotecard::saveAs() -{ - std::string default_filename("untitled.notecard"); - const LLInventoryItem *item = getItem(); - if(item) - { - // gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_NOTECARD, LLPreviewNotecard::gotAssetForSave, this, TRUE); - default_filename = LLDir::getScrubbedFileName(item->getName()); - } - - LLFilePicker& file_picker = LLFilePicker::instance(); - if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_NOTECARD, default_filename ) ) - { - // User canceled or we failed to acquire save file. - return; - } - // remember the user-approved/edited file name. - std::string filename = file_picker.getFirstFile(); - - LLViewerTextEditor* editor = getChild("Notecard Editor"); - - std::string buffer; - if (!editor->exportBuffer(buffer)) - { - // FIXME: Notify the user! - return; - } - - S32 size = buffer.length() + 1; - - std::ofstream export_file(filename.c_str(), std::ofstream::binary); - export_file.write(buffer.c_str(), size); - export_file.close(); -} - -LLUUID LLPreviewNotecard::getNotecardItemID() -{ - return mNotecardItemID; -} - -LLUUID LLPreviewNotecard::getObjectID() -{ - return mObjectID; -} - -// virtual -LLUUID LLPreviewNotecard::getItemID() -{ - const LLViewerInventoryItem* item = getItem(); - if(item) - { - return item->getUUID(); - } - return LLUUID::null; -} -// - -// EOF \ No newline at end of file +// +// virtual +BOOL LLPreviewNotecard::canSaveAs() const +{ + return TRUE; +} + +// virtual +void LLPreviewNotecard::saveAs() +{ + std::string default_filename("untitled.notecard"); + const LLInventoryItem *item = getItem(); + if(item) + { + // gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_NOTECARD, LLPreviewNotecard::gotAssetForSave, this, TRUE); + default_filename = LLDir::getScrubbedFileName(item->getName()); + } + + LLFilePicker& file_picker = LLFilePicker::instance(); + if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_NOTECARD, default_filename ) ) + { + // User canceled or we failed to acquire save file. + return; + } + // remember the user-approved/edited file name. + std::string filename = file_picker.getFirstFile(); + + LLViewerTextEditor* editor = getChild("Notecard Editor"); + + std::string buffer; + if (!editor->exportBuffer(buffer)) + { + // FIXME: Notify the user! + return; + } + + S32 size = buffer.length() + 1; + + std::ofstream export_file(filename.c_str(), std::ofstream::binary); + export_file.write(buffer.c_str(), size); + export_file.close(); +} + +LLUUID LLPreviewNotecard::getNotecardItemID() +{ + return mNotecardItemID; +} + +LLUUID LLPreviewNotecard::getObjectID() +{ + return mObjectID; +} + +// virtual +LLUUID LLPreviewNotecard::getItemID() +{ + const LLViewerInventoryItem* item = getItem(); + if(item) + { + return item->getUUID(); + } + return LLUUID::null; +} +// + +// EOF