livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,776 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Igor Borovkov b20e7dcb72 fixed EXT-5429 IM chat history of active tab in IM container is not updated when IM container is unminimized 
--HG--
branch : product-engine
 2010-02-15 18:53:17 +02:00
Tofu Linden ed116da131 DEV-33767 VWR-13897: Deleting multiple open animations crashes the viewer 
We were closing preview floaters while we were in the middle of assembling the MoveInventoryItem message.  But closing an anim preview floater issues a AgentAnimation message to stop any playing animation previews.  On resuming the MoveInventoryItem assembly, message system is in a rightly confused state.

Made preview window closing happen before we start assembling the MoveInventoryItem message.
 2010-02-15 16:48:41 +00:00
Igor Borovkov 61e799a443 fixed EXT-5428 Detached IM window doesn't show received messages. 
--HG--
branch : product-engine
 2010-02-15 18:14:51 +02:00
Tofu Linden 7c640406dd PE merge. 2010-02-15 15:38:05 +00:00
Andrew Dyukov 9b001fad99 Fixed major bug EXT-4911 (Viewer exits if "Cancel" is pressed while teleporting inside region). 
- LLProgressView::onCancelButtonClicked() now requests quit depending on startup state instead of teleport state.

--HG--
branch : product-engine
 2010-02-15 17:08:52 +02:00
Igor Borovkov 5a1ef0214a fixed EXT-5010 Redundant resident name in the IM log for offers 
--HG--
branch : product-engine
 2010-02-15 16:43:52 +02:00
Paul Guslisty c9fabaca4e Fixed low bug EXT - 5187 (Remove Friend should be in friends list context menu) 
--HG--
branch : product-engine
 2010-02-15 14:26:30 +02:00
Vadim Savchuk 8ba5e0155f Merge from default branch 
--HG--
branch : product-engine
 2010-02-15 13:46:49 +02:00
Tofu Linden 32ea5e0e84 PE merge. 2010-02-15 11:33:47 +00:00
Paul Guslisty 75a060497c Fixed low bug EXT-5069 (Bad user experience while blocking avatar from view profile panel). Replaced using of menu_item_check with menu_item_call 
--HG--
branch : product-engine
 2010-02-15 10:51:43 +02:00
Kent Quirk 0b579ba112 Automated merge from viewer-2-0 to normalize beta 3 2010-02-13 19:05:21 -05:00
Tofu Linden 9fee359d1b CID-3 
Checker: CHECKED_RETURN
Function: LLImageDecodeThread::update(unsigned int)
File: /indra/llimage/llimageworker.cpp
 2010-02-13 14:37:48 +00:00
Tofu Linden 66298ab6b6 Bah, can't use llassert in llxuiparser. 2010-02-13 14:20:15 +00:00
Tofu Linden 45ea2bbd1e simpler fix for CID-202 2010-02-13 14:18:04 +00:00
Tofu Linden fa69f09e68 CID-202 
Checker: REVERSE_INULL
Function: LLScriptEventHandler::recurse(_iobuf *, int, int, e_lscript_compile_pass, e_lscript_prune_type, int &, LLScriptScope *, e_lscript_types &, e_lscript_types, unsigned long long &, LLScriptByteCodeChunk *, LLScriptByteCodeChunk *, int, LLScriptScopeEntry *, int, LLScriptLibData **)
 2010-02-13 14:15:31 +00:00
Tofu Linden eb1d043daf CID-203 
Checker: REVERSE_INULL
Function: LLTabContainer::addTabPanel(const LLTabContainer::TabPanelParams &)
File: /indra/llui/lltabcontainer.cpp
 2010-02-13 14:13:06 +00:00
Tofu Linden 1936b5769e CID-204 
Checker: REVERSE_INULL
Function: LLXUIXSDWriter::writeXSD(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, const LLInitParam::BaseBlock &)
File: /indra/llxuixml/llxuiparser.cpp
 2010-02-13 14:11:20 +00:00
Tofu Linden d7060eb323 CID-205 
Checker: REVERSE_INULL
Function: LLPanel::fromXML(LLPointer<LLXMLNode>, LLView *, LLPointer<LLXMLNode>)
File: /indra/llui/llpanel.cpp
 2010-02-13 14:08:58 +00:00
Tofu Linden cf69f03af1 CID-206 
Checker: REVERSE_INULL
Function: LLMultiSliderCtrl::onEditorCommit(LLUICtrl *, const LLSD &)
File: /indra/llui/llmultisliderctrl.cpp
 2010-02-13 14:06:31 +00:00
Tofu Linden a0c57cbb82 CID-207 assert. 2010-02-13 14:05:09 +00:00
Tofu Linden 74ffa0fa48 CID-207 
Checker: REVERSE_INULL
Function: LLInventoryModel::addItem(LLViewerInventoryItem *)
File: /indra/newview/llinventorymodel.cpp
 2010-02-13 14:04:26 +00:00
Tofu Linden 3ac37e9b89 CID-211 
Checker: REVERSE_INULL
Function: LLChicletPanel::findChiclet<LLIMChiclet>(const LLUUID &)
File: /indra/newview/llchiclet.h
 2010-02-13 14:00:30 +00:00
Tofu Linden 710687ce67 CID-208 
Checker: REVERSE_INULL
Function: LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup *)
File: /indra/newview/llvovolume.cpp
 2010-02-13 13:49:08 +00:00
Tofu Linden 51e2ee7b3a CID-145 
Checker: NULL_RETURNS
File: /indra/llui/llscrolllistctrl.cpp
 2010-02-13 13:45:28 +00:00
Tofu Linden 0cf46fe136 CID-144 
Checker: NULL_RETURNS
Function: LLInvFVBridgeAction::doAction(const LLUUID &, LLInventoryModel *)
File: /indra/newview/llinventorybridge.cpp
 2010-02-13 13:43:33 +00:00
Tofu Linden 10c9f17301 CID-139 
Checker: NULL_RETURNS
Function: LLPanelFaceSetTEFunctor::apply(LLViewerObject *, int)
File: /indra/newview/llpanelface.cpp
 2010-02-13 13:40:45 +00:00
Tofu Linden eb140739db CID-138 
Checker: NULL_RETURNS
Function: LLPanelFace::sendGlow()
File: /indra/newview/llpanelface.cpp
 2010-02-13 13:37:08 +00:00
Tofu Linden 86056788ec CID-134 
Checker: NULL_RETURNS
Function: LLToolsEnableUnlink::handleEvent(const LLSD &)
File: /indra/newview/llviewermenu.cpp
 2010-02-13 13:35:53 +00:00
Tofu Linden af0bfb388a CID-132 
Checker: NULL_RETURNS
Function: LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCategory *)
File: /indra/newview/llpanellandmarkinfo.cpp
 2010-02-13 13:33:26 +00:00
Tofu Linden bcbd12f7b1 PE merge. 2010-02-13 12:33:56 +00:00
Palmer Truelson 3b8463f0fd merge 2010-02-12 21:06:25 -08:00
Palmer Truelson 1f672990e7 Backed out davep's optimization pass. changeset 3c3685de430a 2010-02-12 21:06:02 -08:00
Palmer Truelson 660c3b182c merge 2010-02-12 21:05:09 -08:00
Palmer Truelson 651b14fcae Backed out davep's UI optimization. changeset 3134cb7bb181 2010-02-12 21:04:51 -08:00
Palmer Truelson 6499aee37c merge 2010-02-12 21:04:01 -08:00
Palmer Truelson b392e1c3bd Backed out dave's FSAA/FBO change changeset 89f62bede16f 2010-02-12 21:03:43 -08:00
Palmer Truelson 85abcf4206 merge 2010-02-12 21:02:40 -08:00
Palmer Truelson 25be5a201f Backed out bao's fix to FSAA that will also be backed out. changeset ae9bbbf181d9 2010-02-12 21:02:25 -08:00
Rick Pasetto f82e57a9c7 Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses 2010-02-12 17:36:51 -08:00
Erica 718e45f6e4 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-12 17:15:35 -08:00
Erica fecd9b2bab EXT-5365change shoe icon in Viewer 2.0 inventory list 2010-02-12 17:15:15 -08:00
Xiaohong Bao af229a7bb0 cast type F32 to GLint to eliminate some compiling warnings. 2010-02-12 17:11:36 -08:00
Richard Linden 7c86d44348 potential fix for bad font names 2010-02-12 17:08:10 -08:00
Richard Linden e159873eec added popup panel to hold nearby media popup and stopped using top view 2010-02-12 16:54:47 -08:00
Mark Palange (Mani) 0b450b6003 Changing viewer unit test licenses to viewergpl 2010-02-12 16:32:28 -08:00
Palmer 9aae3a31c8 merge 2010-02-12 15:56:25 -08:00
Callum Prentice ae39812d70 Merge with tip 2010-02-12 15:26:08 -08:00
Callum Prentice c0f2f151b2 "Fix for EXT-4968 - Media DnD cannot navigate prims owned by other people" 
Reviewed by Rick via CodeCollab (http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=110)
 2010-02-12 15:24:53 -08:00
Palmer 418504207b merge 2010-02-12 15:16:19 -08:00
Xiaohong Bao 434436ef6b Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-12 15:11:21 -08:00