diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-27 15:33:46 -0400 |
| commit | 0c360c5223af6473b701f2f41d525f1f70c2ead5 (patch) | |
| tree | dc59a8390988ece0d340632171f06e0af83507e1 /indra/newview/llviewerregion.h | |
| parent | 7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (diff) | |
| parent | 170de8330e3be55794878cefb53f62266c9a029d (diff) | |
merge changes for storm-1210
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 9c5b85b77f..a6e5c47b86 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -275,6 +275,7 @@ public: F32 getLandHeightRegion(const LLVector3& region_pos); void getInfo(LLSD& info); + typedef enum { |