diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/newview/llviewerparcelmgr.h | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/newview/llviewerparcelmgr.h')
| -rw-r--r-- | linden/indra/newview/llviewerparcelmgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h index 9bf6096..59e6186 100644 --- a/linden/indra/newview/llviewerparcelmgr.h +++ b/linden/indra/newview/llviewerparcelmgr.h | |||
| @@ -82,6 +82,8 @@ public: | |||
| 82 | LLViewerParcelMgr(); | 82 | LLViewerParcelMgr(); |
| 83 | ~LLViewerParcelMgr(); | 83 | ~LLViewerParcelMgr(); |
| 84 | 84 | ||
| 85 | void init(F32 region_size); | ||
| 86 | |||
| 85 | static void cleanupGlobals(); | 87 | static void cleanupGlobals(); |
| 86 | 88 | ||
| 87 | BOOL selectionEmpty() const; | 89 | BOOL selectionEmpty() const; |