Merged bug fixes by Mm Alder and Admiral Admiral.

22 files changed, 123 insertions, 16 deletions

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 44d1ad1..1146c44 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -154,7 +154,7 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setPassDelete(TRUE);
                 mInputEditor->setReplaceNewlinesWithSpaces(FALSE);
 
-                mInputEditor->setMaxTextLength(1023);
+                mInputEditor->setMaxTextLength(DB_CHAT_MSG_STR_LEN);
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
@@ -624,8 +624,12 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
-        std::string utf8_text = wstring_to_utf8str(wtext);
+        if (!utf8_out_text.empty())
+        {
+                utf8_out_text = utf8str_truncate(utf8_out_text, MAX_MSG_STR_LEN);
+        }
 
+        std::string utf8_text = wstring_to_utf8str(wtext);
         utf8_text = utf8str_trim(utf8_text);
         if (!utf8_text.empty())
         {
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index 5f8d9ed..3222c0d 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -348,6 +348,8 @@ LLXMLNodePtr LLColorSwatchCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_COLOR_SWATCH_CTRL_TAG);
+
         node->createChild("color", TRUE)->setFloatValue(4, mColor.mV);
 
         node->createChild("border_color", TRUE)->setFloatValue(4, mBorderColor.mV);
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index 6cb3bef..a7c1214 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -312,6 +312,11 @@ void LLHUDEffectBeam::render()
         }
 }
 
+void LLHUDEffectBeam::renderForTimer()
+{
+        render();
+}
+
 void LLHUDEffectBeam::setupParticle(const S32 i)
 {
         LLVector3d start_pos_global;
diff --git a/linden/indra/newview/llhudeffectbeam.h b/linden/indra/newview/llhudeffectbeam.h
index 7365894..69e2b51 100644
--- a/linden/indra/newview/llhudeffectbeam.h
+++ b/linden/indra/newview/llhudeffectbeam.h
@@ -58,6 +58,7 @@ protected:
         ~LLHUDEffectBeam();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index 32b52f8..08f4c78 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -287,3 +287,8 @@ void LLHUDEffectSpiral::render()
                 return;
         }
 }
+
+void LLHUDEffectSpiral::renderForTimer()
+{
+        render();
+}
diff --git a/linden/indra/newview/llhudeffecttrail.h b/linden/indra/newview/llhudeffecttrail.h
index 60836c2..033fbeb 100644
--- a/linden/indra/newview/llhudeffecttrail.h
+++ b/linden/indra/newview/llhudeffecttrail.h
@@ -68,6 +68,7 @@ protected:
         ~LLHUDEffectSpiral();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index bdff492..ea6e0bf 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -308,6 +308,27 @@ void LLHUDObject::renderAllForSelect()
 }
 
 // static
+void LLHUDObject::renderAllForTimer()
+{
+        LLHUDObject *hud_objp;
+        
+        hud_object_list_t::iterator object_it;
+        for (object_it = sHUDObjects.begin(); object_it != sHUDObjects.end(); )
+        {
+                hud_object_list_t::iterator cur_it = object_it++;
+                hud_objp = (*cur_it);
+                if (hud_objp->getNumRefs() == 1)
+                {
+                        sHUDObjects.erase(cur_it);
+                }
+                else if (hud_objp->isVisible())
+                {
+                        hud_objp->renderForTimer();
+                }
+        }
+}
+
+// static
 void LLHUDObject::sortObjects()
 {
         sHUDObjects.sort(hud_object_further_away());    
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 2cd8abf..84c2f84 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -75,6 +75,7 @@ public:
         static void updateAll();
         static void renderAll();
         static void renderAllForSelect();
+        static void renderAllForTimer();
 
         static void cleanupHUDObjects();
 
@@ -106,6 +107,7 @@ protected:
 
         virtual void render() = 0;
         virtual void renderForSelect() {};
+        virtual void renderForTimer() {};
         
 protected:
         U8                              mType;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a5950ce..326694a 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1197,7 +1197,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
 
         setTitle(mSessionLabel);
 
-        mInputEditor->setMaxTextLength(1023);
+        mInputEditor->setMaxTextLength(DB_IM_MSG_STR_LEN);
         // enable line history support for instant message bar
         mInputEditor->setEnableLineHistory(TRUE);
 
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f0bfa00..97df7a3 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1654,6 +1654,8 @@ LLXMLNodePtr LLInventoryPanel::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLPanel::getXML(false); // Do not print out children
 
+        node->setName(LL_INVENTORY_PANEL_TAG);
+
         node->createChild("allow_multi_select", TRUE)->setBoolValue(mFolders->getAllowMultiSelect());
 
         return node;
diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index 326c511..05c5e41 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -248,16 +248,10 @@ EJoystickQuadrant LLJoystick::quadrantFromName(const std::string& sQuadrant)
 
 LLXMLNodePtr LLJoystick::getXML(bool save_children) const
 {
-        LLXMLNodePtr node = LLUICtrl::getXML();
+        LLXMLNodePtr node = LLButton::getXML();
 
-        node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(getHAlign()));
         node->createChild("quadrant", TRUE)->setStringValue(nameFromQuadrant(mInitialQuadrant));
-
-        addImageAttributeToXML(node,getImageUnselectedName(),getImageUnselectedID(),std::string("image_unselected"));
-        addImageAttributeToXML(node,getImageSelectedName(),getImageSelectedID(),std::string("image_selected"));
         
-        node->createChild("scale_image", TRUE)->setBoolValue(getScaleImage());
-
         return node;
 }
 
@@ -327,6 +321,15 @@ void LLJoystickAgentTurn::onHeldDown()
         }
 }
 
+LLXMLNodePtr LLJoystickAgentTurn::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLJoystick::getXML();
+
+        node->setName(LL_JOYSTICK_TURN);
+
+        return node;
+}
+
 LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("button");
@@ -435,6 +438,15 @@ void LLJoystickAgentSlide::onHeldDown()
 }
 
 
+LLXMLNodePtr LLJoystickAgentSlide::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLJoystick::getXML();
+
+        node->setName(LL_JOYSTICK_SLIDE);
+
+        return node;
+}
+
 // static
 LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index 076a506..b26851f 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -97,6 +97,7 @@ public:
 
         virtual void    onHeldDown();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
 };
@@ -114,6 +115,7 @@ public:
         virtual void    onHeldDown();
         virtual void    onMouseUp();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 };
 
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index e4a6573..5997369 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -141,6 +141,16 @@ LLSD LLNameEditor::getValue() const
         return LLSD(mNameID);
 }
 
+// virtual
+LLXMLNodePtr LLNameEditor::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLLineEditor::getXML();
+
+        node->setName(LL_NAME_EDITOR_TAG);
+
+        return node;
+}
+
 LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("name_editor");
diff --git a/linden/indra/newview/llnameeditor.h b/linden/indra/newview/llnameeditor.h
index bc5a678..964682c 100644
--- a/linden/indra/newview/llnameeditor.h
+++ b/linden/indra/newview/llnameeditor.h
@@ -62,6 +62,7 @@ public:
 
         virtual ~LLNameEditor();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         void setNameID(const LLUUID& name_id, BOOL is_group);
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index baf0656..453cf7f 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -288,6 +288,8 @@ LLXMLNodePtr LLNameListCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLScrollListCtrl::getXML();
 
+        node->setName(LL_NAME_LIST_CTRL_TAG);
+
         node->createChild("allow_calling_card_drop", TRUE)->setBoolValue(mAllowCallingCardDrop);
 
         if (mNameColumnIndex != 0)
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index c4ea71e..5500973 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -969,6 +969,8 @@ LLXMLNodePtr LLTextureCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_TEXTURE_CTRL_TAG);
+
         node->createChild("label", TRUE)->setStringValue(getLabel());
 
         node->createChild("default_image_name", TRUE)->setStringValue(getDefaultImageName());
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 296c540..e5e2cd6 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1555,6 +1555,16 @@ BOOL LLViewerTextEditor::exportBuffer( std::string& buffer )
         return TRUE;
 }
 
+// virtual
+LLXMLNodePtr LLViewerTextEditor::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLTextEditor::getXML();
+
+        node->setName(LL_TEXT_EDITOR_TAG);
+
+        return node;
+}
+
 LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("text_editor");
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index f29caee..c69b3f0 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -54,6 +54,7 @@ public:
 
         virtual void makePristine();
         
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         // mousehandler overrides
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 7e1c6ca..afee0a1 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -169,7 +169,7 @@ const F32 TIME_BEFORE_MESH_CLEANUP = 5.f; // seconds
 const S32 AVATAR_RELEASE_THRESHOLD = 10; // number of avatar instances before releasing memory
 const F32 FOOT_GROUND_COLLISION_TOLERANCE = 0.25f;
 const F32 AVATAR_LOD_TWEAK_RANGE = 0.7f;
-const S32 MAX_BUBBLE_CHAT_LENGTH = 1023;
+const S32 MAX_BUBBLE_CHAT_LENGTH = DB_CHAT_MSG_STR_LEN;
 const S32 MAX_BUBBLE_CHAT_UTTERANCES = 12;
 const F32 CHAT_FADE_TIME = 8.0;
 const F32 BUBBLE_CHAT_TIME = CHAT_FADE_TIME * 3.f;
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 89cb62b..453b9d2 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -1012,6 +1012,16 @@ void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
         mLastBrowserDepth = media_depth;
 }
 
+// virtual
+LLXMLNodePtr LLWebBrowserCtrl::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_WEB_BROWSER_CTRL_TAG);
+
+        return node;
+}
+
 LLView* LLWebBrowserCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("web_browser");
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 0f46aa1..0100807 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -191,6 +191,7 @@ class LLWebBrowserCtrl :
                 // Defaults to true.
                 void setTakeFocusOnClick( bool take_focus );
 
+                virtual LLXMLNodePtr getXML(bool save_children = true) const;
                 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
                 // handle mouse related methods
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 4ea9e41..d3ee8b6 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2724,12 +2724,20 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
         LLVertexBuffer::unbind();
         
-        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred)
         {
-                // Render debugging beacons.
-                gObjectList.renderObjectBeacons();
-                LLHUDObject::renderAll();
-                gObjectList.resetObjectBeacons();
+                if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+                {
+                        // Render debugging beacons.
+                        gObjectList.renderObjectBeacons();
+                        LLHUDObject::renderAll();
+                        gObjectList.resetObjectBeacons();
+                }
+                else
+                {
+                        // Make sure particle effects disappear
+                        LLHUDObject::renderAllForTimer();
+                }
         }
 
         LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
@@ -2954,6 +2962,11 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera)
                 LLHUDObject::renderAll();
                 gObjectList.resetObjectBeacons();
         }
+        else
+        {
+                // Make sure particle effects disappear
+                LLHUDObject::renderAllForTimer();
+        }
 
         if (occlude)
         {