8 files changed, 39 insertions, 13 deletions

diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 51daefb..4f1ba26 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -468,6 +468,11 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
                         LLSpinCtrl::onDownBtn(this);
                         return TRUE;
                 }
+                if(key == KEY_RETURN)
+                {
+                        forceEditorCommit();
+                        return TRUE;
+                }
         }
         return FALSE;
 }
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index efe32e7..e9705de 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2776,6 +2776,22 @@
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterAnimationListRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for Animation List</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>275</integer>
+        <integer>1000</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterAudioVolumeRect</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 403ab20..608fb54 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -102,7 +102,7 @@ private:
 
 LLChatBar::LLChatBar() 
 :       LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
-        mChannelControl(FALSE),
+        mChanCtrlEnabled(FALSE),
         mInputEditor(NULL),
         mGestureLabelTimer(),
         mLastSpecialChatChannel(0),
@@ -157,6 +157,8 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
+        mChannelControl = getChild<LLSpinCtrl>("channel_control");
+
         toggleChannelControl();
 
         mIsBuilt = TRUE;
@@ -218,7 +220,7 @@ void LLChatBar::refresh()
 
         childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
 
-        childSetValue("channel_control",( 1.f * ((S32)(getChild<LLSpinCtrl>("channel_control")->get()))) );
+        //childSetValue("channel_control",( 1.f * ((S32)(mChannelControl->get()))) );
         childSetEnabled("Say", mInputEditor->getText().size() > 0);
         childSetEnabled("Shout", mInputEditor->getText().size() > 0);
 
@@ -379,7 +381,7 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
         }
         else
         {
-                if (!mChannelControl)
+                if (!mChanCtrlEnabled)
                 {
                         // This is normal chat.
                         *channel = 0;
@@ -399,7 +401,7 @@ void LLChatBar::sendChat( EChatType type )
                         // store sent line in history, duplicates will get filtered
                         if (mInputEditor) mInputEditor->updateHistory();
                         // Check if this is destined for another channel
-                        S32 channel = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0;
+                        S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0;
 
                         stripChannelNumber(text, &channel);
                         
@@ -441,9 +443,9 @@ void LLChatBar::sendChat( EChatType type )
 void LLChatBar::toggleChannelControl()
 {
         LLRect input_rect = mInputEditor->getRect();
-        S32 chan_width = getChild<LLSpinCtrl>("channel_control")->getRect().getWidth();
+        S32 chan_width = mChannelControl->getRect().getWidth();
         BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect");
-        BOOL control = getChild<LLSpinCtrl>("channel_control")->getVisible();
+        BOOL control = mChannelControl->getVisible();
 
         if (visible && !control)
         {
@@ -460,7 +462,7 @@ void LLChatBar::toggleChannelControl()
 
         childSetVisible("channel_control", visible);
         childSetEnabled("channel_control", visible);
-        mChannelControl = visible;
+        mChanCtrlEnabled = visible;
 }
 
 
@@ -616,7 +618,7 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type,
 void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
 {
         // Look for "/20 foo" channel chats.
-        S32 channel = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0;
+        S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0;
 
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 53ac233..96961ae 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -43,6 +43,7 @@ class LLUUID;
 class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
+class LLSpinCtrl;
 
 class LLChatBar
 :       public LLPanel
@@ -113,7 +114,8 @@ protected:
         LLChatBarGestureObserver* mObserver;
 
 private:
-        BOOL                            mChannelControl;
+        BOOL                            mChanCtrlEnabled;
+        LLSpinCtrl*                     mChannelControl;
 };
 
 extern LLChatBar *gChatBar;
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 1f51a21..1f34ad0 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
         childSetVisible("Chat History Editor with mute",FALSE);
         childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
         setDefaultBtn("Chat");
+
+        //toggleHistoryChannelControl(); temporarily disable until working
 }
 
 LLFloaterChat::~LLFloaterChat()
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index f3b7278..6e55cda 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -194,7 +194,7 @@ void LLPrefsChatImpl::apply()
                 if (gChatBar)
                 {
                         gChatBar->toggleChannelControl();
-                        LLFloaterChat::toggleHistoryChannelControl();
+                        //LLFloaterChat::toggleHistoryChannelControl(); temporarily disable until working
                 }
                 mChatChannel = chan_check;
         }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index d5e4d20..0146f9e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2329,7 +2329,6 @@ class LLObjectEnableExport : public view_listener_t
                                 {
                                         if(gAgent.getID()!=node->mPermissions->getCreator())
                                         {
-                                                llwarns<<"Incorrect permission to export"<<llendl;
                                                 return false;
                                         }
                                         return true;
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 81fe178..92b7008 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1952,8 +1952,8 @@
       <on_check control="ShowConsoleWindow" />
     </menu_item_check>
 
-    <menu_item_check name="Restrained Life Active"
-                     label="Restrained Life Active">
+    <menu_item_check name="Restrained Life Support"
+                     label="Restrained Life Support">
       <on_click function="RLVa.Main.Toggle" />
       <on_check function="RLVa.Main.Enabled" />
     </menu_item_check>