summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-20 11:15:14 -0700
committercallum_linden <none@none>2014-10-20 11:15:14 -0700
commit3350922080a02217b419a32b412b6e33656f00da (patch)
tree6d2d6a010fe451ea25ed5d7fedf8c5d3b03f8867 /indra
parent4e7ad651cbf12b97b2e27e2ab195b256074bc895 (diff)
Update to build on Xcode 6.0: self assigment of var to var - typo?
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewerregion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 11cbf3fc24..049be1733e 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1924,7 +1924,7 @@ public:
}
else if( i != you_index)
{
- U32 loc = x << 16 | y << 8 | z; loc = loc;
+ U32 loc = x << 16 | y << 8 | z;
U32 pos = 0x0;
pos |= x;
pos <<= 8;