diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-02 15:59:24 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-02 15:59:24 -0700 |
| commit | 0f6c3a167850a34bad9982ed29eb25c141845320 (patch) | |
| tree | 800d474cce6f33a1eb05a6838802235aff58a83e /indra/viewer_components | |
| parent | be151807222ffa5972256aa9a392e8a319eae5ee (diff) | |
| parent | 9cc290ef8fccdc585027d84ac9cfb864ed933061 (diff) | |
Merge
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/updater/llupdatechecker.cpp | 3 | ||||
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.cpp | 4 | ||||
| -rw-r--r-- | indra/viewer_components/updater/llupdaterservice.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index 8733bb7ac0..9cfa919b39 100644 --- a/indra/viewer_components/updater/llupdatechecker.cpp +++ b/indra/viewer_components/updater/llupdatechecker.cpp @@ -30,6 +30,9 @@ #include "llupdatechecker.h" #include "lluri.h" +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif class LLUpdateChecker::Implementation: public LLHTTPClient::Responder diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp index 62c909e57b..e339c69724 100644 --- a/indra/viewer_components/updater/llupdaterservice.cpp +++ b/indra/viewer_components/updater/llupdaterservice.cpp @@ -34,6 +34,10 @@ #include <boost/scoped_ptr.hpp> #include <boost/weak_ptr.hpp> +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif + boost::weak_ptr<LLUpdaterServiceImpl> gUpdater; class LLUpdaterServiceImpl : diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h index 6459ca49f8..313ae8ada3 100644 --- a/indra/viewer_components/updater/llupdaterservice.h +++ b/indra/viewer_components/updater/llupdaterservice.h @@ -58,4 +58,4 @@ private: boost::shared_ptr<LLUpdaterServiceImpl> mImpl; }; -#endif LL_UPDATERSERVICE_H +#endif // LL_UPDATERSERVICE_H |