summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-19 17:56:43 -0400
committerOz Linden <oz@lindenlab.com>2013-06-19 17:56:43 -0400
commit1108cd0e5c052176f9dacc69b04d702a06b744de (patch)
tree21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/newview/llviewerregion.h
parent2268bf38339178f93b317693c0a6808807301d64 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
merge changes for 3.6.0-release
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rwxr-xr-xindra/newview/llviewerregion.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index b5fe4677b7..56cd0c9ea1 100755
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -342,7 +342,7 @@ public:
void getNeighboringRegionsStatus( std::vector<S32>& regions );
const LLViewerRegionImpl * getRegionImpl() const { return mImpl; }
LLViewerRegionImpl * getRegionImplNC() { return mImpl; }
-
+
public:
struct CompareDistance
{