summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-20 14:00:39 -0700
committercallum_linden <none@none>2014-10-20 14:00:39 -0700
commit577a3973ea1bc268b14ba3101474fb0b9a9bade1 (patch)
tree4bbe95bf73cf7fac29683fc0f00eec2b15f701d0 /indra/newview/llviewerregion.cpp
parentc853b470db48d9bdda0a336068c4bbbe2ab2761f (diff)
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 049be1733e..c0c9855903 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -87,8 +87,6 @@
// out the two lists of capabilities for analysis.
//#define DEBUG_CAPS_GRANTS
-const F32 WATER_TEXTURE_SCALE = 8.f; // Number of times to repeat the water texture across a region
-const S16 MAX_MAP_DIST = 10;
// The server only keeps our pending agent info for 60 seconds.
// We want to allow for seed cap retry, but its not useful after that 60 seconds.
// Give it 3 chances, each at 18 seconds to give ourselves a few seconds to connect anyways if we give up.
@@ -1924,7 +1922,6 @@ public:
}
else if( i != you_index)
{
- U32 loc = x << 16 | y << 8 | z;
U32 pos = 0x0;
pos |= x;
pos <<= 8;