de7ca5abb2
Merge. Note: changeset b048156543b6 (Fixed normal bug EXT - 5104) was initially commited into default branch by mistake
...
--HG--
branch : product-engine
2010-02-11 10:38:34 +02:00
b0af6b8acb
Merge from default branch
...
--HG--
branch : product-engine
2010-02-11 09:49:57 +02:00
0e035fd9b8
Fixed normal bug EXT - 5104 (Remove names from below Profile image in IM windows)
...
- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
2010-02-11 09:41:20 +02:00
abae31cb4a
Provisional fix for EXT-2939
...
Restored the call to updateMotions(LLCharacter::HIDDEN_UPDATE) in LLVOAvatar::updateCharacter().
Added a specific fast timer for hidden updates in LLCharacter::updateMotions() to assess how much this will impact performance.
Reviewed by Richard.
2010-02-10 18:31:39 -08:00
6961a1501f
build fix
2010-02-10 18:40:15 -08:00
92ee1045f2
merge
2010-02-10 18:13:41 -08:00
8bc4dcc855
EXT-5321 - llinfos from non ui threads is not thread safe
...
reviewed by Mani
2010-02-10 18:13:02 -08:00
41b1b2849f
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-10 18:08:29 -08:00
60cb3f8fd2
fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values.
2010-02-10 18:08:00 -08:00
93c4a7a18f
Finish up EXT-3908
...
Remove code for aspect ratio controls from LLFloaterPreference. (The XUI had already been removed.)
Reviewed by Richard.
2010-02-10 17:16:38 -08:00
da3ad612df
merge.
2010-02-10 21:00:51 +00:00
efe1f7c6f6
Fix 'fast alpha' option for non-deferred rendering. This is a developer toggle which we don't support as such, but people with old viewers may have it turned on and will experience new artifacts without this fix.
...
Fix is isolated to this fast-alpha case.
2010-02-10 21:00:00 +00:00
409cade29d
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-10 12:40:48 -08:00
53a9f46b8a
EXT-4357Add a color overlay to the selected tool and shape in build tools
2010-02-10 12:40:23 -08:00
62c8091693
Removed referral text.
...
https://jira.secondlife.com/browse/EXT-3909
2010-02-10 15:20:11 -05:00
d3bde04a8c
Fixed normal bug (EXT-5111) Mysterious disabled arrow widget on Places tab.
...
--HG--
branch : product-engine
2010-02-10 22:05:37 +02:00
7403d53e68
Fixed normal bug EXT-4566 ([BSI] private chat end floater reports incorrectly who ended the call)
...
- Added flag to voicechannel which is true when call is ended by agent.
- It is sent to imview via signal and used to properly customize text in outgoing call floater.
--HG--
branch : product-engine
2010-02-10 21:42:39 +02:00
369c58b09c
DEV-43688 Cycle3 JA linguistic changes by Rika for better UI, post truncation fix
2010-02-10 11:38:00 -08:00
bac0248f3b
merge.
2010-02-10 18:49:06 +00:00
eeb4800858
CID-130
...
Checker: NULL_RETURNS
Function: LLSpatialBridge::LLSpatialBridge(LLDrawable *, int, unsigned int)
File: /indra/newview/lldrawable.cpp
2010-02-10 18:43:13 +00:00
cd62780457
bracket fix.
2010-02-10 18:41:54 +00:00
e7c9f67494
CID-136
...
Checker: NULL_RETURNS
Function: LLInventorySort::operator ()(const LLFolderViewItem *const &, const LLFolderViewItem *const &)
File: /indra/newview/llfolderviewitem.cpp
2010-02-10 18:40:13 +00:00
1fcc26d570
CID-141
...
Checker: NULL_RETURNS
Function: LLFolderBridge::folderOptionsMenu()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:35:29 +00:00
fd4aee8f83
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-10 10:35:03 -08:00
4139e26926
change the cache version number to force to clear old cache.
2010-02-10 10:34:33 -08:00
3aa6150e80
CID-142
...
Checker: NULL_RETURNS
Function: LLFolderBridge::determineFolderType()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:33:21 +00:00
b7b2d2b3ee
CID-152
...
Checker: NULL_RETURNS
Function: LLSpatialBridge::updateMove()
File: /indra/newview/lldrawable.cpp
2010-02-10 18:31:34 +00:00
2bc74a4e99
CID-52
...
Checker: FORWARD_NULL
Function: LLPluginMessagePipe::pump(double)
File: /indra/llplugin/llpluginmessagepipe.cpp
2010-02-10 18:25:54 +00:00
5206f0fe91
CID-53
...
Checker: FORWARD_NULL
Function: LLPluginProcessChild::idle()
File: /indra/llplugin/llpluginprocesschild.cpp
2010-02-10 18:23:12 +00:00
f484d4dace
CID-59
...
Checker: FORWARD_NULL
Function: LLEditingMotion::onUpdate(float, unsigned char *)
File: /indra/llcharacter/lleditingmotion.cpp
minor.
2010-02-10 18:20:24 +00:00
51499b555a
CID-65
...
Checker: FORWARD_NULL
Function: LLAgent::sendMessage()
File: /indra/newview/llagent.cpp
not a bug.
2010-02-10 18:12:15 +00:00
1d66e3a1fb
CID-69
...
Checker: FORWARD_NULL
Function: LLFace::switchTexture(LLViewerTexture *)
File: /indra/newview/llface.cpp
not a bug.
2010-02-10 18:11:35 +00:00
5afe94fec4
CID-70
...
Checker: FORWARD_NULL
Function: LLLocalTextureObject::LLLocalTextureObject(const LLLocalTextureObject&)
File: /indra/newview/lllocaltextureobject.cpp
not a bug.
2010-02-10 18:10:38 +00:00
54ba657e17
CID-71
...
Checker: FORWARD_NULL
Function: LLFace::getGeometryVolume(const LLVolume &, const int &, const LLMatrix4 &, const LLMatrix3 &, const unsigned short &)
File: /indra/newview/llface.cpp
2010-02-10 18:07:54 +00:00
ef515029b6
CID-80
...
Checker: FORWARD_NULL
Function: LLSidepanelAppearance::onOpen(const LLSD &)
File: /indra/newview/llsidepanelappearance.cpp
2010-02-10 18:05:49 +00:00
d86c69c738
merge
...
--HG--
branch : product-engine
2010-02-10 20:04:47 +02:00
e861020043
zmg fix for normal EXT-5245 Cannot create a new line in group notice creation with enter key
...
--HG--
branch : product-engine
2010-02-10 20:03:20 +02:00
284cab7f0f
CID-82
...
Checker: FORWARD_NULL
Function: LLFolderBridge::pasteFromClipboard()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 18:01:46 +00:00
d928ed69a9
CID-86
...
Checker: FORWARD_NULL
Function: LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel *)
File: /indra/newview/llpanellandmarks.cpp
2010-02-10 18:00:06 +00:00
664c659601
CID-87
...
Checker: FORWARD_NULL
Function: LLLocationInputCtrl::refreshLocation()
File: /indra/newview/lllocationinputctrl.cpp
2010-02-10 17:59:01 +00:00
6e73357a86
CID-88
...
Checker: FORWARD_NULL
Function: LLItemBridge::restoreToWorld()
File: /indra/newview/llinventorybridge.cpp
2010-02-10 17:48:03 +00:00
ed26b11f68
CID-89
...
Checker: FORWARD_NULL
Function: LLObjectBridge::performAction(LLFolderView *, LLInventoryModel *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>)
File: /indra/newview/llinventorybridge.cpp
2010-02-10 17:45:50 +00:00
5707b71d09
CID-90
...
Checker: FORWARD_NULL
Function: LLCallingCardBridge::buildContextMenu(LLMenuGL &, unsigned int)
File: /indra/newview/llinventorybridge.cpp
2010-02-10 17:44:18 +00:00
8fec8c46df
CID-92
...
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnCancel()
File: /indra/newview/llfloaterpreference.cpp
CID-91
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnApply()
File: /indra/newview/llfloaterpreference.cpp
2010-02-10 17:42:07 +00:00
6bd628dc57
CID-93
...
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnOK()
File: /indra/newview/llfloaterpreference.cpp
2010-02-10 17:40:56 +00:00
8419c4ec8a
CID-95
...
Checker: FORWARD_NULL
Function: LLFloaterMediaSettings::commitFields()
File: /indra/newview/llfloatermediasettings.cpp
2010-02-10 17:36:40 +00:00
143de8db4e
CID-96
...
Checker: FORWARD_NULL
Function: LLDriverParam::getNextDistortion(unsigned int *, LLPolyMesh **)
File: /indra/newview/lldriverparam.cpp
2010-02-10 17:35:34 +00:00
612df63956
CID-97
...
Checker: FORWARD_NULL
Function: LLAgentWearables::setWearableOutfit(const LLDynamicArray<LLPointer<LLInventoryItem>, (int)32> &, LLDynamicArray<LLWearable *, (int)32>&, int)
File: /indra/newview/llagentwearables.cpp
2010-02-10 17:33:28 +00:00
d398131bd7
CID-96
2010-02-10 17:31:51 +00:00
4a8b0e0f43
merge.
2010-02-10 17:26:29 +00:00
Mike Antipov