livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2022-05-04 20:18:30 +02:00
parent fcfcc97d4a 8112cefa73
commit 08b1f4aae0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpanelface.cpp
View File

@ -3377,7 +3377,8 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
te,
itemp_res,
from_library ? LLToolDragAndDrop::SOURCE_LIBRARY : LLToolDragAndDrop::SOURCE_AGENT,
LLUUID::null);
LLUUID::null,
0);
}
}
// not an inventory item or no complete items

6
indra/newview/lltooldraganddrop.cpp
View File

@ -1109,7 +1109,8 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
S32 hit_face,
LLInventoryItem* item,
LLToolDragAndDrop::ESource source,
const LLUUID& src_id)
const LLUUID& src_id,
S32 tex_channel)
{
if (hit_face == -1) return;
if (!item)
@ -1133,7 +1134,8 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
if (gFloaterTools->getVisible() && panel_face)
{
switch (LLSelectMgr::getInstance()->getTextureChannel())
tex_channel = (tex_channel > -1) ? tex_channel : LLSelectMgr::getInstance()->getTextureChannel();
switch (tex_channel)
{
case 0:

3
indra/newview/lltooldraganddrop.h
View File

@ -244,7 +244,8 @@ public:
static void dropTextureOneFace(LLViewerObject* hit_obj, S32 hit_face,
LLInventoryItem* item,
ESource source,
const LLUUID& src_id);
const LLUUID& src_id,
S32 tex_channel = -1);
static void dropTextureAllFaces(LLViewerObject* hit_obj,
LLInventoryItem* item,
ESource source,