diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-12 20:32:48 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-12 20:32:48 +0300 |
| commit | d53055406ea82f57edc7d5f59ed73ca1cda90621 (patch) | |
| tree | 323cbb66b5af361c2eacaa840322ef92844b594d /indra | |
| parent | 674f5b770657dfe04205becdd4a4efb6a2aa3141 (diff) | |
DRTVWR-521 xcode buildfix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 7d18bae947..e5b4dec1bd 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -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); } diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 7db9c640f2..5d938bbc70 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -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; }; |