From cd4219729880e89da62335b8b81855aa9683bb3a Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Thu, 12 May 2011 18:09:04 -0400 Subject: Added tag DRTVWR-55_2.6.8-beta1, 2.6.8-beta1 for changeset beafa8a9bd1d --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index f22f9e2d9e..30fe81d3cd 100644 --- a/.hgtags +++ b/.hgtags @@ -109,3 +109,5 @@ d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1 bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 DRTVWR-52_2.6.6-beta1 bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1 5e349dbe9cc84ea5795af8aeb6d473a0af9d4953 2.6.8-start +beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 +beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 -- cgit v1.2.3 From ce554304fbc21e8a52b236a56eea70287f002fdd Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 18 May 2011 11:46:55 -0600 Subject: fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 --- indra/llmessage/lldatapacker.h | 5 +++++ indra/newview/llvocache.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h index dd9c4eaa38..b0a638c16e 100644 --- a/indra/llmessage/lldatapacker.h +++ b/indra/llmessage/lldatapacker.h @@ -168,10 +168,15 @@ public: S32 getCurrentSize() const { return (S32)(mCurBufferp - mBufferp); } S32 getBufferSize() const { return mBufferSize; } + const U8* getBuffer() const { return mBufferp; } void reset() { mCurBufferp = mBufferp; mWriteEnabled = (mCurBufferp != NULL); } void freeBuffer() { delete [] mBufferp; mBufferp = mCurBufferp = NULL; mBufferSize = 0; mWriteEnabled = FALSE; } void assignBuffer(U8 *bufferp, S32 size) { + if(mBufferp && mBufferp != bufferp) + { + freeBuffer() ; + } mBufferp = bufferp; mCurBufferp = bufferp; mBufferSize = size; diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index b888a263d0..c605ddb1c8 100644 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -76,6 +76,7 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file) S32 size = -1; BOOL success; + mDP.assignBuffer(mBuffer, 0); success = check_read(apr_file, &mLocalID, sizeof(U32)); if(success) { @@ -136,10 +137,11 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file) LLVOCacheEntry::~LLVOCacheEntry() { - if(mBuffer) + if(mBuffer != mDP.getBuffer()) { - delete[] mBuffer; + delete[] mBuffer ; //just in case } + mDP.freeBuffer(); } -- cgit v1.2.3 From 5027ee4a8d7ece0e6a2874618637cb6505c959c3 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Thu, 19 May 2011 18:40:09 -0400 Subject: Added tag DRTVWR-57_2.6.9-beta1, 2.6.9-beta1 for changeset 77e5a08344c9 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 83ea5c1609..9152652c04 100644 --- a/.hgtags +++ b/.hgtags @@ -114,3 +114,5 @@ bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1 e67da2c6e3125966dd49eef98b36317afac1fcfe 2.6.9-start beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 +77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-57_2.6.9-beta1 +77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-beta1 -- cgit v1.2.3 From a1868f841b76b347b555f040d70e13c04f9b9517 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:38:48 -0700 Subject: FIX VWR-24161 en_xui_change --- indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 8a37822413..7717872a6a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -47,7 +47,7 @@ height="12" name="font_colors" top_pad="20" - width="120" + width="170" > Chat font colors: @@ -275,7 +275,7 @@ height="12" name="bubble_chat" top_pad="20" - width="450" + width="495" > Name tag background color (also affects Bubble Chat): @@ -320,7 +320,7 @@ height="12" name="floater_opacity" top_pad="15" - width="120" + width="200" > Floater Opacity: -- cgit v1.2.3 From 5dee1ef57e7b95d493c8a27fba9464fa75a833da Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:43:30 -0700 Subject: FIX VWR-25009 --- indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_preferences_move.xml | 2 +- indra/newview/skins/default/xui/es/panel_preferences_privacy.xml | 2 +- indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index f20ce52125..cefd1a5516 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -723,7 +723,7 @@ follows="left|top" height="12" layout="topleft" - left="358" + left="388" left_pad="-30" name="TerrainDetailText" top="250" @@ -735,7 +735,7 @@ draw_border="false" height="38" layout="topleft" - left_delta="0" + left_delta="10" name="TerrainDetailRadio" top_pad="5" width="70"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 04412bdb9c..1a8aae7f91 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -195,7 +195,7 @@ left="0" name="radio_teleport" top_delta="20" - width="100" /> + width="110" /> - + Registros de chat: diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index a2f9b4176e..5af2fed142 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml @@ -9,7 +9,7 @@ - + -- cgit v1.2.3 From 2ba00f4317b023294e825a8853e5e4e69c02b4a2 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:44:42 -0700 Subject: FIX VWR-25010 en_xui_change --- indra/newview/skins/default/xui/en/floater_buy_currency.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 49deb9b025..9f6eac198b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -299,7 +299,7 @@ Re-enter amount to see the latest exchange rate. type="string" font="SansSerifHuge" left="165" - width="170" + width="360" height="25" top="25" name="info_cannot_buy"> -- cgit v1.2.3 From 26041278ac990777787c5b524ff6fb89a7b78f3b Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:46:01 -0700 Subject: FIX VWR-25011 en_xui_change --- indra/newview/skins/default/xui/de/panel_preferences_privacy.xml | 2 +- indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index b56f150394..e21bed6bb5 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml @@ -11,7 +11,7 @@ - + Chatprotokolle: diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index cdc462109c..ea09286592 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -180,14 +180,14 @@ increment="1" initial_value="23" label="Nearby chat toasts life time:" - label_width="190" + label_width="285" layout="topleft" left="45" max_val="60" min_val="1" name="nearby_toasts_lifetime" top_pad="10" - width="230" /> + width="325" /> + width="325" /> Date: Thu, 19 May 2011 16:49:33 -0700 Subject: FIX VWR-25015 --- .../skins/default/xui/es/floater_postcard.xml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml index df94486c0e..b5b9805fe2 100644 --- a/indra/newview/skins/default/xui/es/floater_postcard.xml +++ b/indra/newview/skins/default/xui/es/floater_postcard.xml @@ -1,29 +1,25 @@ - Correo electrónico - del destinatario: - - - - Su correo - electrónico: - - + Correo del destinatario: + + + Su correo: + Su nombre: - + Asunto: - + Mensaje: Escriba aquí el mensaje. - + Si su destinatario se registra en [SECOND_LIFE], usted conseguirá un bono de referido. -- cgit v1.2.3 From 19a1e6f9db82671653765b9107dbe40d8c7fff26 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:50:26 -0700 Subject: FIX VWR-25017 en_xui_change --- indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index e374c89f21..91fe6f544c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -341,7 +341,7 @@ layout="topleft" left="25" name="voice_chat_settings" - width="180" + width="200" top_pad="7"> Voice Chat Settings -- cgit v1.2.3 From a76afb5026ce8a0dd83bc1562e919aaf4fbed974 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 May 2011 16:52:08 -0700 Subject: WIP VWR-25018 --- .../skins/default/xui/de/floater_postcard.xml | 78 ++++++++++----------- .../skins/default/xui/fr/floater_postcard.xml | 79 ++++++++++------------ 2 files changed, 72 insertions(+), 85 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml index 91e0bb8133..49dcd4af51 100644 --- a/indra/newview/skins/default/xui/de/floater_postcard.xml +++ b/indra/newview/skins/default/xui/de/floater_postcard.xml @@ -1,42 +1,36 @@ - - - - E-Mail des Empfängers: - - - - Ihre E-Mail: - - - - Ihr Name: - - - - Betreff: - - - - Nachricht: - - - Nachricht hier eingeben. - - - -