Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Kent Quirk 96f29d2ba0 Update message template to agree with server-1-36 2010-02-11 18:58:33 -05:00
Xiaohong Bao 17707455d2 additional fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values 2010-02-11 15:35:22 -08:00
Xiaohong Bao fb994809f4 fix for EXT-5353: prim visibility issues. 2010-02-11 14:58:08 -08:00
Rick Pasetto cd73d68846 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-11 14:05:54 -08:00
Rick Pasetto 53d827781e Merge from viewer-2-0 2010-02-11 14:05:44 -08:00
Callum Prentice f791d103c8 Merge with tip 2010-02-11 14:04:40 -08:00
Callum Prentice 92468f0dea Fix for EXT-5175 (prefs review: Chat Prefs tab settings need labels)
Not reviewed - coordinate and whitespace changes only
2010-02-11 14:04:06 -08:00
Loren Shih dc61885aa6 automated merge viewer2.0->viewer2.0 2010-02-11 16:34:24 -05:00
Loren Shih 35d43f2562 EXT-5105 Incorrect keyboard shortcut for Inventory in main menu
EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater

Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater.  Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted).
As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active.
2010-02-11 16:33:56 -05:00
Leyla Farazha de1cf42eb6 EXT-5044 substasks: turning the event panel into an event floater.
reviewed by Richard.
2010-02-11 12:41:10 -08:00
Nyx (Neal Orman) af96d8c061 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-11 15:22:49 -05:00
Nyx (Neal Orman) 0459dd1e39 EXT-5343 appearance editor "save as" does not affect Current outfit
changed logic of the save as button to copy a link from the newly created
inventory item to the current outfit folder. This makes your changes
persist on relog.

Reviewed by Vir.
2010-02-11 15:22:38 -05:00
Callum Prentice c7715a74fd Merge with tip 2010-02-11 11:44:21 -08:00
Callum Prentice 494a42a680 Added reference to updated version of LLQtWebKit (Disables right click breakage in Flash)
Not reviewed (no useful info in this change)
2010-02-11 11:41:43 -08:00
Callum Prentice 109fd91c8b Fix for EXT-4961 www.slurl.com will not DnD while slurl.com will
Ccollab reviewed by Rick - http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=101
2010-02-11 11:40:21 -08:00
Tofu Linden a97c4d3ad8 merge 2010-02-11 19:02:20 +00:00
Tofu Linden c61e1cef91 PE merge 2010-02-11 18:45:33 +00:00
Loren Shih e612015500 automated merge viewer2.0->viewer2.0 2010-02-11 13:43:47 -05:00
Eugene Mutavchi 7ac90e2a08 Fixed low bug EXT-5329 (Delete option is enabled in context menu for empty edit field in IM floater)
--HG--
branch : product-engine
2010-02-11 19:56:56 +02:00
Eugene Mutavchi 740f1cd2c7 Fixed low bug EXT-5227(Clicking online toasts should spawn IM window)
--HG--
branch : product-engine
2010-02-11 19:56:54 +02:00
Loren Shih 99b29fc394 EXT-5332 : Fix coverty whine on break statement fallthrough - LLInventoryFunctions.cpp
Mandated by Tofu to fix a break statement fallthrough for coverty.  This is not my team's code but I was happy to fix it.
BTW: This does not result in any functionality change, so it is makes no difference outside coverty whether we get this into viewer2 versus viewer2.1.
Reviewed by: Vir
2010-02-11 12:00:49 -05:00
Igor Borovkov 2b0752aa80 fix for EXT-5324 'You started a voice call' message appear after first text message in session
--HG--
branch : product-engine
2010-02-11 18:12:21 +02:00
Eric M. Tulla (BigPapi) 39fe664b97 Minor clarification edit to a warning comment. 2010-02-11 11:09:08 -05:00
Eric M. Tulla (BigPapi) e3f75c2c25 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-11 11:08:06 -05:00
Eric M. Tulla (BigPapi) 71ae50c56b EXT-4387 - Possible fix. No repro, but added an extra safety check and warning the only place in the function that it appears that something could go wrong
if we have inventory corruption and InventoryType is wearable but the wearable type bitfield is in a broken state.
-Reviewed by vir.
2010-02-11 11:06:42 -05:00
Paul Guslisty 634f723d50 Partly fixed EXT - 4606 (land sales to specific person cuts off text below). Shifted down text below by one pixel
--HG--
branch : product-engine
2010-02-11 17:58:00 +02:00
angela 368c992298 EXT-5105 Incorrect keyboard shortcut for Inventory in main menu 2010-02-11 23:43:28 +08:00
angela f078c53da8 merge with remote repo 2010-02-11 23:34:20 +08:00
angela 3684b437a0 EXT-5164 Me->My Inventory opens Inventory floater, not side panel 2010-02-11 23:30:01 +08:00
Chuck Linden 5e12a2cb69 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-11 10:13:35 -05:00
Chuck Linden 0762ebdf98 Added tool tip to Clear History button.
https://jira.secondlife.com/browse/EXT-5312
2010-02-11 10:13:14 -05:00
Tofu Linden f023d23829 merge. 2010-02-11 14:57:44 +00:00
Aimee Linden d7e8a30a5a merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-11 14:53:11 +00:00
Aimee Linden 898e9da1af EXT-5264 : Debug setting to show in-world voice visualizations while in private voice calls
Added ShowVoiceVisualizersInCalls, setting it to true will show voice visualizers, lipsync and voice gestures for people in the same voice session that are also visible in-world.
2010-02-11 14:47:41 +00:00
Tofu Linden f210d79443 PE merge. 2010-02-11 14:47:29 +00:00
Aimee Linden 5173c2a93a Fixing another suicidal timer tick() 2010-02-11 14:44:36 +00:00
Tofu Linden 1b8a7fdeaa CID-146
Checker: NULL_RETURNS
Function: LLNotificationChannelPanel::onClickNotification(void *)
File: /indra/newview/llfloaternotificationsconsole.cpp
2010-02-11 14:32:55 +00:00
Tofu Linden 10e7b598fa CID-147
Checker: NULL_RETURNS
Function: LLNotificationChannelPanel::onClickNotificationReject(void *)
File: /indra/newview/llfloaternotificationsconsole.cpp
2010-02-11 14:30:40 +00:00
angela 01561ea13a merge from remote repo 2010-02-11 22:29:43 +08:00
Tofu Linden 2d7badb604 CID-148
Checker: NULL_RETURNS
Function: LLFloaterGesture::onClickPlay()
File: /indra/newview/llfloatergesture.cpp
2010-02-11 14:28:35 +00:00
angela e747e9a3da EXT-4837 [NUX] When filter results in null state, provide a message suggesting the user try global search. 2010-02-11 22:27:49 +08:00
Tofu Linden dd360d05dc CID-149
Checker: NULL_RETURNS
Function: LLFloaterGesture::onCopyPasteAction(const LLSD &)
File: /indra/newview/llfloatergesture.cpp
2010-02-11 14:26:21 +00:00
Tofu Linden d56525aaec CID-150
Checker: NULL_RETURNS
Function: LLFloaterGesture::onCopyPasteAction(const LLSD &)
File: /indra/newview/llfloatergesture.cpp
2010-02-11 14:24:38 +00:00
Tofu Linden 7aa169bd16 CID-151
Checker: NULL_RETURNS
Function: LLFavoritesBarCtrl::insertBeforeItem(LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const LLUUID &, LLViewerInventoryItem *)
File: /indra/newview/llfavoritesbar.cpp
2010-02-11 14:23:06 +00:00
Tofu Linden a1e2ce7fa2 CID-153
Checker: NULL_RETURNS
Function: LLAgentWearables::makeNewOutfit(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, const LLDynamicArray<int, (int)32> &, const LLDynamicArray<int, (int)32> &, int)
File: /indra/newview/llagentwearables.cpp
2010-02-11 14:21:59 +00:00
Tofu Linden 03d7153e55 CID-67
Checker: FORWARD_NULL
Function: LLFloaterTools::updatePopup(LLCoordGL, unsigned int)
File: /indra/newview/llfloatertools.cpp
2010-02-11 14:18:54 +00:00
Tofu Linden 4307d45a30 CID-66
Checker: FORWARD_NULL
Function: LLVOAvatar::parseSkeletonFile(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llvoavatar.cpp

not a bug.
2010-02-11 14:17:08 +00:00
Tofu Linden 63e421d3b3 CID-64
Checker: FORWARD_NULL
Function: LLFeatureManager::loadFeatureTables()
File: /indra/newview/llfeaturemanager.cpp

not a bug.
2010-02-11 14:15:41 +00:00
Tofu Linden 641b44fc83 CID-63
Checker: FORWARD_NULL
Function: LLFloaterProperties::dirtyAll()
File: /indra/newview/llfloaterproperties.cpp
2010-02-11 14:14:21 +00:00
Tofu Linden bf26124cbc CID-60
Checker: FORWARD_NULL
Function: LLMultiSliderCtrl::onEditorCommit(LLUICtrl *, const LLSD &)
File: /indra/llui/llmultisliderctrl.cpp
2010-02-11 14:12:46 +00:00