Second Life viewer sources 1.14.0.0

1 files changed, 18 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 00e25af..f84c875 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -72,6 +72,9 @@ public:
         LLEmbeddedItems(const LLViewerTextEditor* editor);
         ~LLEmbeddedItems();
         void clear();
+
+        // return true if there are no embedded items.
+        bool empty();
         
         void    bindEmbeddedChars(const LLFontGL* font);
         void    unbindEmbeddedChars(const LLFontGL* font);
@@ -134,6 +137,13 @@ void LLEmbeddedItems::clear()
                 removeEmbeddedItem(*nextiter);
         }
         mEmbeddedUsedChars.clear();
+        mEmbeddedIndexedChars.clear();
+}
+
+bool LLEmbeddedItems::empty()
+{
+        removeUnusedChars();
+        return mEmbeddedUsedChars.empty();
 }
 
 // Inserts a new unique entry
@@ -1386,10 +1396,11 @@ S32 LLViewerTextEditor::insertEmbeddedItem( S32 pos, LLInventoryItem* item )
 
 bool LLViewerTextEditor::importStream(std::istream& str)
 {
-        LLNotecard nc(MAX_NOTECARD_SIZE);
+        LLNotecard nc(LLNotecard::MAX_SIZE);
         bool success = nc.importStream(str);
         if (success)
         {
+                mEmbeddedItemList->clear();
                 const std::vector<LLPointer<LLInventoryItem> >& items = nc.getItems();
                 mEmbeddedItemList->addItems(items);
                 // Actually set the text
@@ -1415,6 +1426,11 @@ void LLViewerTextEditor::copyInventory(LLInventoryItem* item)
                                                                  item);
 }
 
+bool LLViewerTextEditor::hasEmbeddedInventory()
+{
+        return (!(mEmbeddedItemList->empty()));
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 BOOL LLViewerTextEditor::importBuffer( const LLString& buffer )
@@ -1425,7 +1441,7 @@ BOOL LLViewerTextEditor::importBuffer( const LLString& buffer )
 
 BOOL LLViewerTextEditor::exportBuffer( LLString& buffer )
 {
-        LLNotecard nc(MAX_NOTECARD_SIZE);
+        LLNotecard nc(LLNotecard::MAX_SIZE);
 
         std::vector<LLPointer<LLInventoryItem> > embedded_items;
         mEmbeddedItemList->getEmbeddedItemList(embedded_items);