diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/llcommon/llcommon.h | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/llcommon/llcommon.h')
| -rw-r--r-- | linden/indra/llcommon/llcommon.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h index 851d4ac..300ebe2 100644 --- a/linden/indra/llcommon/llcommon.h +++ b/linden/indra/llcommon/llcommon.h | |||
| @@ -43,8 +43,6 @@ class LL_COMMON_API LLCommon | |||
| 43 | public: | 43 | public: |
| 44 | static void initClass(); | 44 | static void initClass(); |
| 45 | static void cleanupClass(); | 45 | static void cleanupClass(); |
| 46 | private: | ||
| 47 | static BOOL sAprInitialized; | ||
| 48 | }; | 46 | }; |
| 49 | 47 | ||
| 50 | #endif | 48 | #endif |