Second Life viewer sources 1.21.1-RC

13 files changed, 38 insertions, 27 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c181ce8..f2653cd 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5814,7 +5814,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>RenderDebugPipeline</key>
     <map>
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index da23710..c9ad5a3 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -792,6 +792,14 @@ bool LLTextureCacheRemoteWorker::doWrite()
 //virtual
 bool LLTextureCacheWorker::doWork(S32 param)
 {
+        //allocate a new local apr_pool
+        LLAPRPool pool ;
+
+        //save the current mFileAPRPool to avoid breaking anything.
+        apr_pool_t* old_pool = mCache->getFileAPRPool() ;
+        //make mFileAPRPool to point to the local one
+        mCache->setFileAPRPool(pool.getAPRPool()) ;
+
         bool res = false;
         if (param == 0) // read
         {
@@ -805,6 +813,10 @@ bool LLTextureCacheWorker::doWork(S32 param)
         {
                 llassert_always(0);
         }
+
+        //set mFileAPRPool back, the local one will be released automatically.
+        mCache->setFileAPRPool(old_pool) ;
+
         return res;
 }
 
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 14f44ba..4bac15c 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -114,6 +114,9 @@ protected:
         std::string getTextureFileName(const LLUUID& id);
         void addCompleted(Responder* responder, bool success);
         
+protected:
+        void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; }
+
 private:
         void setDirNames(ELLPath location);
         void readHeaderCache(apr_pool_t* poolp = NULL);
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index 32d7f63..9034634 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -757,7 +757,6 @@ void send_stats()
         S32 window_height = gViewerWindow->getWindowDisplayHeight();
         S32 window_size = (window_width * window_height) / 1024;
         misc["string_1"] = llformat("%d", window_size);
-        misc["string_1"] = llformat("%.dx%d", window_width, window_height);
         // misc["string_2"] = 
 //      misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
 //      misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 1f5dd44..bd40796 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1370,6 +1370,11 @@ BOOL LLViewerWindow::handleDeviceChange(LLWindow *window)
         return FALSE;
 }
 
+void LLViewerWindow::handlePingWatchdog(LLWindow *window, const char * msg)
+{
+        LLAppViewer::instance()->pingMainloopTimeout(msg);
+}
+
 //
 // Classes
 //
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 683d331..9262e61 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -174,7 +174,7 @@ public:
         /*virtual*/ void handleDataCopy(LLWindow *window, S32 data_type, void *data);
         /*virtual*/ BOOL handleTimerEvent(LLWindow *window);
         /*virtual*/ BOOL handleDeviceChange(LLWindow *window);
-
+        /*virtual*/ void handlePingWatchdog(LLWindow *window, const char * msg);
 
 
         //
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d6c9e2f..a9ecf9d 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -6269,10 +6269,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
         mDrawable->mXform.setPosition(rel_pos);
         mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot);
 
-        //in case the viewerobject is not updated in time
-        mDrawable->getVObj()->setPosition(sit_object->getWorldPosition()) ;
-        mDrawable->getVObj()->setRotation(sit_object->getWorldRotation()) ;
-
         gPipeline.markMoved(mDrawable, TRUE);
         mIsSitting = TRUE;
         mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
@@ -6333,10 +6329,6 @@ void LLVOAvatar::getOffObject()
         mDrawable->mXform.setPosition(cur_position_world);
         mDrawable->mXform.setRotation(cur_rotation_world);      
         
-        //in case the viewerobject is not updated from sim in time
-        mDrawable->getVObj()->setPosition(cur_position_world);
-        mDrawable->getVObj()->setRotation(cur_rotation_world);
-
         gPipeline.markMoved(mDrawable, TRUE);
 
         mIsSitting = FALSE;
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 8b17754..57736b4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1041,7 +1041,7 @@ MINSPECS
 Do you wish to visit [_URL] for more information?
                 </message>
                 <ignore name="ignore">
-                        Ignore unsupported hardware
+                        When detecting unsupported hardware
                 </ignore>
                 <option name="Yes">
                         Yes
@@ -1088,7 +1088,7 @@ adjust your graphics settings to something more appropriate.
 (Edit menu > Preferences > Graphics).
                 </message>
                 <ignore name="ignore">
-                        Ignore unknown graphics card
+                        When detecting an unknown graphics card
                 </ignore>
         </alert>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
index e30438b..51953b05 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
@@ -36,7 +36,7 @@
                 You are not a session moderator.
         </string>
         <string name="muted_error">
-                You have been muted.
+                A group moderator disabled your text chat.
         </string>
         <string name="add_session_event">
                 adding agents to chat session with
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 31d80f6..be18c7e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -32,7 +32,7 @@
                 Starting session with [NAME], please wait.

         </string>

         <string name="moderated_chat_label">

-                (Moderated)

+                (Moderated: Voices off by default)

         </string>

         <string name="default_text_label">

                 Click here to instant message.

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 279202a..d3174af 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -61,7 +61,7 @@
              width="237" />
         <check_box bottom="-245" control_name="IMLogTimestamp" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Show timestamps in IM Log" left="168"
+             initial_value="false" label="Show timestamps in IM log" left="168"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
         <check_box bottom="-265" control_name="LogShowHistory" enabled="true" follows="left|top"
@@ -76,14 +76,14 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-325" control_name="LogTimestampDate" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Include date with timestamp" left="168" mouse_opaque="true"
-             name="log_date_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-345" control_name="LogChatIM" enabled="true" follows="left|top"
+        <check_box bottom="-325" control_name="LogChatIM" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
+        <check_box bottom="-345" control_name="LogTimestampDate" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Include date with timestamps" left="148" mouse_opaque="true"
+             name="log_date_timestamp" radio_style="false" width="237" />
         <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Change Path" label_selected="Change Path" left="170"
              mouse_opaque="true" name="log_path_button" width="90" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 1a9b6a8..f6c1887 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -12,10 +12,10 @@
                         <combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5"

                              name="moderation_mode" width="130">

                                 <combo_item name="OpenVoice" value="unmoderated">

-                                        Open Voice (default)

+                                        Voices on by default

                                 </combo_item>

                                 <combo_item name="ModeratedVoice" value="moderated">

-                                        Moderated Voice

+                                        Voices off by default

                                 </combo_item>

                         </combo_box>

                 </layout_panel>

diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index 58c6bcc..c7e8272 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -43,8 +43,8 @@
              description="These Abilities include powers to modify this group&apos;s identity, such as changing public visibility, charter, and insignia."
              name="Group Identity">
                 <action
-                     description="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information."
-                     longdescription="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information. This is done in the General tab."
+                     description="Change Charter, Insignia, &apos;Show in search&apos;, and which members are publicly visible in Group Information."
+                     longdescription="Change Charter, Insignia, &apos;Show in search&apos;, and which members are publicly visible in Group Information. This is done in the General tab."
                      name="group change identity" value="11" />
         </action_set>
         <action_set
@@ -70,8 +70,8 @@
                      longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
                      name="land find places" value="17" />
                 <action
-                     description="Change parcel name, description, and &apos;Publish on the Web&apos; settings"
-                     longdescription="Change parcel name, description, and &apos;Publish on the Web&apos; settings. This is done in About Land &gt; Options tab."
+                     description="Change parcel name, description, and &apos;Show in search&apos; settings"
+                     longdescription="Change parcel name, description, and &apos;Show in search&apos; settings. This is done in About Land &gt; Options tab."
                      name="land change identity" value="18" />
                 <action description="Set landing point and set teleport routing"
                      longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."