summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-12PE merge.Tofu Linden
2010-02-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-11more refinement for EXT-4352: texture problem in viewer 2.0.Xiaohong Bao
2010-02-11additional fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() ↵Xiaohong Bao
sometimes returns bad values
2010-02-11fix for EXT-5353: prim visibility issues.Xiaohong Bao
2010-02-11Merge with tipCallum Prentice
2010-02-11Fix for EXT-5175 (prefs review: Chat Prefs tab settings need labels)Callum Prentice
Not reviewed - coordinate and whitespace changes only
2010-02-11automated merge viewer2.0->viewer2.0Loren Shih
2010-02-11EXT-5105 Incorrect keyboard shortcut for Inventory in main menuLoren Shih
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-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-02-11EXT-5343 appearance editor "save as" does not affect Current outfitNyx (Neal Orman)
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-11Merge with tipCallum Prentice
2010-02-11Fix for EXT-4961 www.slurl.com will not DnD while slurl.com willCallum Prentice
Ccollab reviewed by Rick - http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=101
2010-02-11mergeTofu Linden
2010-02-11PE mergeTofu Linden
2010-02-11automated merge viewer2.0->viewer2.0Loren Shih
2010-02-11Fixed low bug EXT-5329 (Delete option is enabled in context menu for empty ↵Eugene Mutavchi
edit field in IM floater) --HG-- branch : product-engine
2010-02-11Fixed low bug EXT-5227(Clicking online toasts should spawn IM window)Eugene Mutavchi
--HG-- branch : product-engine
2010-02-11EXT-5332 : Fix coverty whine on break statement fallthrough - ↵Loren Shih
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-11fix for EXT-5324 'You started a voice call' message appear after first text ↵Igor Borovkov
message in session --HG-- branch : product-engine
2010-02-11Minor clarification edit to a warning comment.Eric M. Tulla (BigPapi)
2010-02-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-02-11EXT-4387 - Possible fix. No repro, but added an extra safety check and ↵Eric M. Tulla (BigPapi)
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-11Partly fixed EXT - 4606 (land sales to specific person cuts off text below). ↵Paul Guslisty
Shifted down text below by one pixel --HG-- branch : product-engine
2010-02-11EXT-5105 Incorrect keyboard shortcut for Inventory in main menuangela
2010-02-11merge with remote repoangela
2010-02-11EXT-5164 Me->My Inventory opens Inventory floater, not side panelangela
2010-02-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-11Added tool tip to Clear History button.Chuck Linden
https://jira.secondlife.com/browse/EXT-5312
2010-02-11merge.Tofu Linden
2010-02-11merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Aimee Linden
2010-02-11EXT-5264 : Debug setting to show in-world voice visualizations while in ↵Aimee Linden
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-11PE merge.Tofu Linden
2010-02-11Fixing another suicidal timer tick()Aimee Linden
2010-02-11CID-146Tofu Linden
Checker: NULL_RETURNS Function: LLNotificationChannelPanel::onClickNotification(void *) File: /indra/newview/llfloaternotificationsconsole.cpp
2010-02-11CID-147Tofu Linden
Checker: NULL_RETURNS Function: LLNotificationChannelPanel::onClickNotificationReject(void *) File: /indra/newview/llfloaternotificationsconsole.cpp
2010-02-11merge from remote repoangela
2010-02-11CID-148Tofu Linden
Checker: NULL_RETURNS Function: LLFloaterGesture::onClickPlay() File: /indra/newview/llfloatergesture.cpp
2010-02-11EXT-4837 [NUX] When filter results in null state, provide a message ↵angela
suggesting the user try global search.
2010-02-11CID-149Tofu Linden
Checker: NULL_RETURNS Function: LLFloaterGesture::onCopyPasteAction(const LLSD &) File: /indra/newview/llfloatergesture.cpp
2010-02-11CID-150Tofu Linden
Checker: NULL_RETURNS Function: LLFloaterGesture::onCopyPasteAction(const LLSD &) File: /indra/newview/llfloatergesture.cpp
2010-02-11CID-151Tofu Linden
Checker: NULL_RETURNS Function: LLFavoritesBarCtrl::insertBeforeItem(LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const LLUUID &, LLViewerInventoryItem *) File: /indra/newview/llfavoritesbar.cpp
2010-02-11CID-153Tofu Linden
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-11CID-67Tofu Linden
Checker: FORWARD_NULL Function: LLFloaterTools::updatePopup(LLCoordGL, unsigned int) File: /indra/newview/llfloatertools.cpp
2010-02-11CID-66Tofu Linden
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-11CID-64Tofu Linden
Checker: FORWARD_NULL Function: LLFeatureManager::loadFeatureTables() File: /indra/newview/llfeaturemanager.cpp not a bug.
2010-02-11CID-63Tofu Linden
Checker: FORWARD_NULL Function: LLFloaterProperties::dirtyAll() File: /indra/newview/llfloaterproperties.cpp
2010-02-11CID-60Tofu Linden
Checker: FORWARD_NULL Function: LLMultiSliderCtrl::onEditorCommit(LLUICtrl *, const LLSD &) File: /indra/llui/llmultisliderctrl.cpp
2010-02-11CID-115Tofu Linden
Checker: MISSING_BREAK Function: LLGroupMgrGroupData::sendRoleChanges() File: /indra/newview/llgroupmgr.cpp not a bug.
2010-02-11MergedMike Antipov
--HG-- branch : product-engine