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

merge renderer update fix

master
Oz Linden 2013-02-12 13:10:11 -05:00
parent a5cfd935d3 3422f75cf7
commit 66c75202a8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelface.cpp
View File

@ -1352,7 +1352,7 @@ void LLPanelFace::updateMaterial()
mMaterial->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex());
mMaterial->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger()));
llinfos << "Updating material: " << mMaterial->asLLSD() << llendl;
LLSelectMgr::getInstance()->selectionSetMaterial( *mMaterial );
LLSelectMgr::getInstance()->selectionSetMaterial( mMaterial );
// We've sent an update. Need to hold off on any more until
// the sim acknowledges this one.

11
indra/newview/llselectmgr.cpp
View File

@ -2010,18 +2010,19 @@ void LLSelectMgr::selectionSetGlow(F32 glow)
mSelectedObjects->applyToObjects( &func2 );
}
void LLSelectMgr::selectionSetMaterial(LLMaterial& material)
void LLSelectMgr::selectionSetMaterial(LLMaterialPtr material)
{
struct f1 : public LLSelectedTEFunctor
{
LLMaterial mMaterial;
f1(LLMaterial material) : mMaterial(material) {};
LLMaterialPtr mMaterial;
f1(LLMaterialPtr material) : mMaterial(material) {};
bool apply(LLViewerObject* object, S32 face)
{
if (object->permModify())
{
llinfos << "Putting material on object " << object->getID() << " face " << face << ", material: " << mMaterial.asLLSD() << llendl;
LLMaterialMgr::getInstance()->put(object->getID(),face,mMaterial);
llinfos << "Putting material on object " << object->getID() << " face " << face << ", material: " << mMaterial->asLLSD() << llendl;
LLMaterialMgr::getInstance()->put(object->getID(),face,*mMaterial);
object->setTEMaterialParams(face,mMaterial);
}
return true;
}

3
indra/newview/llselectmgr.h
View File

@ -48,6 +48,7 @@
#include <deque>
#include <boost/iterator/filter_iterator.hpp>
#include <boost/signals2.hpp>
#include <boost/make_shared.hpp> // boost::make_shared
class LLMessageSystem;
class LLViewerTexture;
@ -538,7 +539,7 @@ public:
void selectionSetClickAction(U8 action);
void selectionSetIncludeInSearch(bool include_in_search);
void selectionSetGlow(const F32 glow);
void selectionSetMaterial(LLMaterial& material);
void selectionSetMaterial(LLMaterialPtr material);
void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);
void selectionSetObjectName(const std::string& name);