Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Kent Quirk 08d210c7e9 Merge 2010-03-19 14:36:26 -04:00
Kent Quirk 7ba5c0582f merge 2010-03-19 14:36:04 -04:00
Eli Linden 7056e917f2 CT-575 IT set7 translation, new files, for beta 5 2010-03-19 11:11:59 -07:00
Eli Linden 8cd1f7d1e1 FR linguistic; CT-575 IT set7 translation for beta 5 2010-03-19 11:11:42 -07:00
Aimee Linden f362ea9a1b Merge 2010-03-19 17:43:15 +00:00
Aimee Linden 107e076c83 EXT-6486 Update Vivox SDK to 3.1.0001.8181
New Vivox  SDK release to fix three main crash issues discovered through automatic crash reporting to Vivox enabled in Beta 4, along with extra diagnostics to help track down the cause of SLVoice failing to exit.
2010-03-19 17:40:39 +00:00
Loren Shih a3a4306517 automated merge viewer2.0->viewer2.0 2010-03-19 13:21:52 -04:00
Loren Shih b952a5e585 EXT-6479 : Inspect Object floater doesn't update highlight and selection
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset)

Simple fix to only use Inspect floater if it's actually active (i.e. visible).
2010-03-19 13:21:39 -04:00
Karl Stiefvater (qarl) f50be64167 EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent()
added null guard to fix crash when the xform has no parent.  reviewed by davep.
2010-03-19 12:09:06 -05:00
Callum Prentice 40e04fdb3b Merge with tip 2010-03-19 09:46:24 -07:00
Vadim Savchuk 6583a6d648 Fixed bug EXT-5927 (Vertical tab labels should be left-aligned).
Submitting on behalf of Paul Guslisty.

Reviewed by Mike and Q: https://codereview.productengine.com/secondlife/r/70/

--HG--
branch : product-engine
2010-03-19 18:40:59 +02:00
Kent Quirk 1a28e325c4 Merge 2010-03-19 12:05:33 -04:00
Kent Quirk 1e50e4a13a Merge 2010-03-19 12:05:15 -04:00
Kent Quirk 637105e5cf Merge 2010-03-19 11:56:28 -04:00
Loren Shih 2a3c30dc7c EXT-6479 : Inspect Object floater doesn't update highlight and selection
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset)

Very simple fix that addresses some brokenness with the inspect multi-object floater.
Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out.
2010-03-19 11:48:00 -04:00
Nyx (Neal Orman) 6639ba40d1 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-19 11:36:15 -04:00
Alexei Arabadji 7d50a19d6c Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2010-03-19 17:31:59 +02:00
Alexei Arabadji 2d0ca224ea fixed EXT-6472 “No indication about new message/offer if IM window is open but not in focus”,
allowed to increment IM message counter when IM window is opened but doesn't have focus and reset IM counter when IM window get focus;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/76/

--HG--
branch : product-engine
2010-03-19 17:27:54 +02:00
Kent Quirk 5e0be34c26 Merge 2010-03-19 11:27:10 -04:00
Brad Payne (Vir Linden) b84b0e71c1 For EXT-4173, EXT-5871, EXT-3812: increased timeout for wearable asset fetches from 20 seconds to 60 seconds. Reviewed by Nyx 2010-03-19 11:23:51 -04:00
Dmitry Zaporozhan a2150863f9 Updated normal task EXT-5905 - Resolving offers.
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer).

--HG--
branch : product-engine
2010-03-19 17:18:53 +02:00
Alexei Arabadji 167be8f755 Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2010-03-19 17:18:52 +02:00
Alexei Arabadji 63251d8b31 opened and fixed EXT-6478 “Loggable messages that not increments IM counter doesn't shows in IM window”,
added update of IM floater messages on logging to IM session;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/75/

--HG--
branch : product-engine
2010-03-19 17:17:00 +02:00
Nyx (Neal Orman) 01f546baee Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-19 11:15:57 -04:00
Nyx (Neal Orman) 6fc719813e EXT-6445 After copying an item, changes to new item affect old item
Since multiple inventory items can refer to the same asset ID, we needed to
revert changes to old_wearable (indexed by asset ID) after saving changes
made to a wearable to a new asset ID. This prevents user confusion around
unsaved changes.

Code reviewed by vir.
2010-03-19 11:15:46 -04:00
Mike Antipov d217adeede merge with tip
--HG--
branch : product-engine
2010-03-19 17:12:31 +02:00
Mike Antipov 4347af5763 Done normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, profiles: the teleport button is truncated. need 'en' xui designer rework)
* moved Map Button into the dropdown menu (with enable/click logic). New <menu_item_call label="Map" name="show_on_map"> is added into the menu_profile_overflow.xml
 * redesigned rest of buttons to accommodate available space

Now buttons' widths are enough to not truncate labels in all locales.
NOTE: New "Map" item menu should be localized (just move values from panel_profile.xml to menu_profile_overflow.xml) in other locales.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/59/

--HG--
branch : product-engine
2010-03-19 17:03:32 +02:00
Mike Antipov 8f40c559f3 Update for critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk button is truncated "Sprechen". need xui designer to widen it by some 10 pixels
* restored center aligning for Speak button's label.
* also it is right aligned in 'de' locale which has too long value.
* default right padding is set in 'en' locale (in has no effect on center aligned label)

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/36/

--HG--
branch : product-engine
2010-03-19 17:03:17 +02:00
Sergei Litovchuk 627c5a365f (EXT-6470) [TRANSLATED BUT IN EN] Media Nav bar (Media Control)
- Fixed panel name in en/panel_prim_media_controls.xml. Panel name mismatch in localized files prevented from using localized attributes (e.g. tool tips) of all children of this panel.

Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/73/

--HG--
branch : product-engine
2010-03-19 16:59:25 +02:00
Igor Borovkov 1c4eeed50f fixed EXT-6451 Name of people sending a IM some times is NoBody
LLSD::maps keys accross the code are used in mix of cases, lower and upper.
Using "from_id" and "FROM_ID" causes avatar id to be null and thus "no body" was displayed.

BUT this fix is of no use since several minutes ago viewer-offers feature was merged into release,
which overrides avatar name with "Second Life" to display message about teleport offering as system message

Reviewed by Q at https://codereview.productengine.com/secondlife/r/72/

--HG--
branch : product-engine
2010-03-19 16:35:45 +02:00
Dmitry Zaporozhan 5fa1c1531b Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2010-03-19 15:54:01 +02:00
Andrew Dyukov 3781205448 Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs translation)
- Slightly modified regexp to avoid adding of extra space after names and also made demands to the end of the message string more strict by escaping "."

Reviewed by Kent at https://codereview.productengine.com/secondlife/r/55/

--HG--
branch : product-engine
2010-03-19 15:32:14 +02:00
Dmitry Zaporozhan 97a35b4875 Merged with viewer-offers
--HG--
branch : product-engine
2010-03-19 15:30:02 +02:00
Kent Quirk 141f2aa9ee Merge 2010-03-19 00:57:04 -04:00
Xiaohong Bao 7b7114f7ac Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-18 22:08:47 -06:00
Xiaohong Bao 12a86042f7 fix for EXT-6465: sometimes the texture fetching queue is never empty. 2010-03-18 22:07:25 -06:00
Kent Quirk 599c2d7475 Merge. 2010-03-18 23:45:14 -04:00
Kent Quirk a072b63f41 Merge of PE merge with extra head 2010-03-18 23:44:30 -04:00
Monroe Linden 0c1ff8e876 Fix for EXT-6304: Shared media cookies cannot be deleted via Preferences
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig().  These iterate through all loaded instances and send appropriate messages.

Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage.

Made LLViewerMedia set the proxy config properly when creating new instances.  Callum is adding code to do something similar with the cookies enabled flag in a separate commit.

Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead.

Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-18 17:59:14 -07:00
Kent Quirk f0aba77b81 Merge 2010-03-18 20:17:35 -04:00
Richard Linden fd096e5011 EXT-5549 - Can't Select Last Character In Chat Window 2010-03-18 17:12:43 -07:00
Kent Quirk 71183a9a3d Merge 2010-03-18 20:10:51 -04:00
Eli Linden 962135d971 Merge 2010-03-18 17:06:01 -07:00
Eli Linden 5a72ee937f VWR-18276 en_xui_change 2010-03-18 17:05:08 -07:00
Kent Quirk ff608df9bf Merge 2010-03-18 20:00:48 -04:00
Callum Prentice 70df3c1fa7 EXT-6401 - Add feature to disable Javascript via prefs (updates Mac LLQtWebKit - via patch from Monroe) 2010-03-18 16:59:29 -07:00
Callum Prentice cb7fbc8a20 EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs"
Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately
Reviewed by Monroe
2010-03-18 16:53:27 -07:00
Richard Linden fabae99883 EXT-5923 - Change play/pause behavior of Nearby Media affordance
reviewed by BenGlenn
2010-03-18 16:49:44 -07:00
Kent Quirk 452e49a85a Merge 2010-03-18 19:47:31 -04:00
Kent Quirk 7b76906595 Restore function lost in bad merge. 2010-03-18 19:47:09 -04:00