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/newview/llappviewer.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/newview/llappviewer.h')
| -rw-r--r-- | linden/indra/newview/llappviewer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h index 7c9fe89..522050a 100644 --- a/linden/indra/newview/llappviewer.h +++ b/linden/indra/newview/llappviewer.h | |||
| @@ -192,6 +192,7 @@ private: | |||
| 192 | 192 | ||
| 193 | void idle(); | 193 | void idle(); |
| 194 | void idleShutdown(); | 194 | void idleShutdown(); |
| 195 | void idleNameCache(); | ||
| 195 | void idleNetwork(); | 196 | void idleNetwork(); |
| 196 | 197 | ||
| 197 | void sendLogoutRequest(); | 198 | void sendLogoutRequest(); |