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

DRTVWR-521 xcode buildfix

master
Andrey Lihatskiy 2021-07-12 20:32:48 +03:00
parent 674f5b7706
commit d53055406e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llplugin/llpluginprocessparent.cpp
View File

@ -154,9 +154,9 @@ void LLPluginProcessParent::shutdown()
{
EState state = (*it).second->mState;
if (state != STATE_CLEANUP
|| state != STATE_EXITING
|| state != STATE_DONE
|| state != STATE_ERROR)
&& state != STATE_EXITING
&& state != STATE_DONE
&& state != STATE_ERROR)
{
(*it).second->setState(STATE_GOODBYE);
}

2
indra/newview/llinventorybridge.h
View File

@ -403,7 +403,7 @@ public:
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
virtual void performAction(LLInventoryModel* model, std::string action);
bool canSaveTexture(void);
void setFileName(std::string& file_name) { mFileName = file_name; }
void setFileName(std::string file_name) { mFileName = file_name; }
protected:
std::string mFileName;
};