Commit Graph

396 Commits (efca9657a22ebbcacee705c00cac4e803f2ffa98)

Author SHA1 Message Date
Richard Nelson 572e72d8a1 merge 2010-07-20 11:31:23 -07:00
Mike Antipov f3f5687416 EXT-8358 FIXED Added one more server hardcoded string to global strings in notifications.xml to make it localizable.
Added "You died and have been teleported to your home location" string. It requires localization efforts.

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

--HG--
branch : product-engine
2010-07-16 17:37:27 +03:00
Alexei Arabadji 200ad6dca7 EXT-8303 FIXED [crashhunters] Crash in inventory_offer_mute_callback
Details:
Instead of copying shared pointer, raw pointer was used, that cause crash, since notification responder object was accessed after it was destroyed.
Replaced usage copying of raw pointer instead of copying shared pointer of notification responder object, that should live after notification destroyed.

--HG--
branch : product-engine
2010-07-15 18:57:01 +03:00
Dessie Linden b46fff1ba1 Merged from viewer-release 2010-07-14 06:39:14 -07:00
Alexei Arabadji c73dcb0a2d EXT-8341 FIXED Avoided assertion on receiving object auto return notification.
Details:
1 Provided passing necessary is_group parameter to LLPostponedNotification::add<LLPostponedServerObjectNotification> method call;
3 Corrected handling group name in LLPostponedNotification::onCachedNameReceived;
2 Added check on retrieved name from cache name and replacement with fallback value.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/743/

--HG--
branch : product-engine
2010-07-13 19:42:31 +03:00
Dessie Linden 9aad318fb9 Merged from viewer-release 2010-06-25 12:39:46 -07:00
Loren Shih 90148ccc01 EXT-7967 FIXED Hyperlink in clothing offer dialog does nothing
Fixed incorrect logic for auto_open and added some comments to explain expected behavior.
2010-06-24 16:11:54 -04:00
Leyla Farazha b088449517 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07:00
Alexei Arabadji 129da72326 EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided logging of 'item shared' message instead of spawning IM session and add message to it.
Details:
1 Corrected 'ItemsShared' notification message.
2 Avoided spawning session on item shared event.
3 Provided logging of item shared message.
4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/

--HG--
branch : product-engine
2010-06-18 17:52:54 +03:00
Kent Quirk 4bf8a0c7fc Merge (and resolve conflict) from q/viewer-release 2010-06-17 11:37:21 -04:00
Loren Shih 823ae2ea98 EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anything
Fixed highlight and open item code to work for both categories and items (was previously only working for items).
2010-06-16 13:35:57 -04:00
Dessie Linden 9461316e56 Merged from viewer-release 2010-06-11 11:51:59 -07:00
Lynx Linden 5f8cc41e79 Merging latest dessie/viewer-release into brad/viewer-public 2010-06-10 18:57:18 +01:00
Andrew Dyukov ae43801f44 EXT-6655 Fixed Made the default busy message repsonse localizable with already existing account settings
- The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same.

- To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message.

- Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse").

Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run.

Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/

--HG--
branch : product-engine
2010-06-08 23:30:56 +03:00
brad kittenbrink d9052212b5 Merge of latest dessie/viewer-public with brad/viewer-public 2010-05-27 15:40:16 -07:00
Andrew A. de Laix f24c312f83 so long llwindebug, we hardly knew ye. 2010-05-24 15:59:26 -07:00
Tofu Linden 156d462339 merge from viewer-public 2010-05-22 09:04:42 +01:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
Tofu Linden 57602c9c77 merge from viewer-public 2010-05-21 10:34:33 +01:00
Alexei Arabadji 5ba494c4fa EXT-7363 FIXED Provided passing owner ID through chat object since it is necessary to correctly build objectim SLURL when chat history reloads content.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/420/

--HG--
branch : product-engine
2010-05-20 16:47:33 +03:00
Tofu Linden 478c28539b merge from viewer-public 2010-05-18 10:58:18 +01:00
Andrew Polunin bf197d4f41 EXT-7199 FIXED (Enable dragging items from inventory view to current outfit in Outfit Editor)
- HandleDragAndDrop() method was overridden in the LLPanelOutfitEdit class to handle drag and drop operations of the Clothing, Body Parts and Attachments.
- In panel_outfit_edit.xml parameter allow_multi_select was set to true to allow multiple selections.
- Added class LLCOFDragAndDropObserver to implement the drag and drop.
- Class LLInventoryMoveFromWorldObserver renamed to LLInventoryAddItemByAssetObserver.

Drag and drop reimplemented using functionality of the LLInventoryAddItemByAssetObserver.

Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/373/

--HG--
branch : product-engine
2010-05-17 16:52:44 +03:00
Tofu Linden 80b6569105 merge from viewer-public 2010-05-14 10:28:38 +01:00
Tofu Linden a5f365c331 merge from PE's viewer-trunk 2010-05-14 10:22:24 +01:00
Tofu Linden d79351e689 merge from viewer-public 2010-05-14 09:28:08 +01:00
Loren Shih 1d6ebfbb57 EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to return a selection
Function signature change to return a selection instead of taking one as an argument.
2010-05-13 16:53:29 -04:00
Alexei Arabadji 90940d0b06 EXT-7120 ADDITIONAL COMMIT Avoided unnecessary usage of LLNotificationFunctorRegistration for "ConfirmLeaveCall" notification.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/374/

--HG--
branch : product-engine
2010-05-13 18:49:20 +03:00
Tofu Linden e2411ded41 merge from viewer-public 2010-05-12 19:39:30 +01:00
Vadim Savchuk 3afa084e22 Merge from default branch
--HG--
branch : product-engine
2010-05-12 15:43:56 +03:00
Alexei Arabadji 367b77eb1b EXT-6783 FIXED Made notifications that are saved into notification well window be persisted and offer notifications non-persisted.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/368/

--HG--
branch : product-engine
2010-05-12 14:10:26 +03:00
Tofu Linden df07ba176c merge from viewer-public 2010-05-12 11:44:16 +01:00
Tofu Linden 7059173aa9 merge from PE's viewer-trunk 2010-05-12 10:55:19 +01:00
Alexei Arabadji 9ab4d2ca8b EXT-7120 FIXED Added confirmation about leaving group, ad-hoc and p2p call.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/374/

--HG--
branch : product-engine
2010-05-12 11:11:02 +03:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
Tofu Linden 1e0033b175 merge 2010-05-06 20:35:34 +01:00
Alexei Arabadji 00360bb1cd EXT-7097 FIXED
Replaced usage usage of "ObjectGiveItemUnknownUser" notification with functionality provided by LLPostponedNotification class;
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/345/

--HG--
branch : product-engine
2010-05-06 10:09:24 +03:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Tofu Linden f13b30848b merge from viewer-trunk 2010-05-01 15:52:13 +01:00
Tofu Linden 3e55def4e2 merge from viewer-trunk 2010-04-28 12:41:34 +01:00
Alexei Arabadji 26efa9cff4 fixed critical EXT-7092 Fatal error:LLOfferInfo::handleRespond:ASSERT:(!"Unexpected notification name") appears after attempt to resolve offer from object
Added missing handler for "ObjectGiveItemUnknownUser" notification.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/323/

--HG--
branch : product-engine
2010-04-27 17:42:37 +03:00
Loren Shih 29e1804139 automated merge 2010-04-28 13:37:21 -04:00
Loren Shih ed21ab1546 EXT-7108 Creating link to openable item should not open the item (e.g. notecard)
When you create a link to a notecard, you'll no longer open the notecard.
2010-04-27 14:02:10 -04:00
Roxie Linden a42dcc3f5e automated merge 2010-04-23 13:24:09 -07:00
Eugene Mutavchi d0204a2b14 Related to normal bug EXT-6302 (TP requests need to display destination region maturity) - added displaying maturity rating with an icon.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/.

--HG--
branch : product-engine
2010-04-23 21:52:18 +03:00
Vadim Savchuk d24a134df9 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* BuildParams
* indra/newview/CMakeLists.txt
* indra/newview/llviewermessage.cpp

--HG--
branch : product-engine
2010-04-23 15:40:02 +03:00
Tofu Linden 4bec811062 merge from PE's viewer-trunk 2010-04-23 10:44:45 +01:00
Paul Guslisty 9166e7a8a0 Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window appears in EN)
- Added instead of hardcoded string two strings to the strings.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/294/

--HG--
branch : product-engine
2010-04-23 07:46:34 +03:00
Alexei Arabadji 29801ac52b fixed EXT-6972 Object return notification is displayed as notification and nearby chat toasts simultaneously
Made condition of logging to nearby chat more stronger to avoid logging "object return" messages.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/300/

--HG--
branch : product-engine
2010-04-22 15:07:54 +03:00
Tofu Linden ce8451a257 merge from PE's viewer-trunk 'notifications' 2010-04-22 11:03:18 +01:00
Roxie Linden 5b9da4e8d9 Automated merge 2010-04-21 18:17:11 -07:00