diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
| commit | 33c230b46d17a2064994991763643a239e12e2c2 (patch) | |
| tree | 3af380efd9b3f67b26cc8b3c9c5a0fdd1549dd6d /indra/newview/llviewerparcelmgr.cpp | |
| parent | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (diff) | |
A few more merge error fixes.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index bcb3853106..f314de8cfe 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1,4 +1,4 @@ -/** +llvi/** * @file llviewerparcelmgr.cpp * @brief Viewer-side representation of owned land * @@ -58,6 +58,7 @@ #include "llparcelselection.h" #include "llresmgr.h" #include "llsdutil.h" +#include "llsdutil_math.h" #include "llstatusbar.h" #include "llui.h" #include "llviewerimage.h" |