diff options
| author | McCabe Maxsted | 2011-06-08 10:39:05 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-09 23:12:15 -0500 |
| commit | fa16190ea2feb752c365599b14cd4bd6ba585853 (patch) | |
| tree | a9ba633ecd1d003925510491e489199b156b1475 /linden/indra/newview/llglsandbox.cpp | |
| parent | Removed debug setting MaxSelectDistance... (diff) | |
| download | meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.zip meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.gz meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.bz2 meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.xz | |
Don't limit select distance when Disable Max Build Constraints is enabled
(cherry picked from commit c5ce8f27de70b81232aa8995dda80186eebe0247)
Diffstat (limited to 'linden/indra/newview/llglsandbox.cpp')
| -rw-r--r-- | linden/indra/newview/llglsandbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp index 89f9ffa..61d0994 100644 --- a/linden/indra/newview/llglsandbox.cpp +++ b/linden/indra/newview/llglsandbox.cpp | |||
| @@ -230,7 +230,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) | |||
| 230 | glMatrixMode(GL_PROJECTION); | 230 | glMatrixMode(GL_PROJECTION); |
| 231 | gGL.pushMatrix(); | 231 | gGL.pushMatrix(); |
| 232 | 232 | ||
| 233 | BOOL limit_select_distance = gSavedSettings.getBOOL("LimitSelectDistance"); | 233 | BOOL limit_select_distance = (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")); |
| 234 | if (limit_select_distance) | 234 | if (limit_select_distance) |
| 235 | { | 235 | { |
| 236 | // ...select distance from control | 236 | // ...select distance from control |