diff options
| author | McCabe Maxsted | 2011-06-11 00:18:02 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-06-11 00:18:02 -0700 |
| commit | 5208f9493122d02a127b3bf70c41989033af4c96 (patch) | |
| tree | 987b06c1818088a9c94b03a074ad161f3c373af4 /linden/indra/newview | |
| parent | Allow export of textures from Second Life when we have permission (also clean... (diff) | |
| parent | Fixed file that wasn't committed in 231e9eee (missing this breaks prim creation) (diff) | |
| download | meta-impy-5208f9493122d02a127b3bf70c41989033af4c96.zip meta-impy-5208f9493122d02a127b3bf70c41989033af4c96.tar.gz meta-impy-5208f9493122d02a127b3bf70c41989033af4c96.tar.bz2 meta-impy-5208f9493122d02a127b3bf70c41989033af4c96.tar.xz | |
Merge branch '1.4-fbeta-maxselectfix' into 1.4-fbeta-export_texture_sl
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/lltoolplacer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp index 9f5eb09..80b415c 100644 --- a/linden/indra/newview/lltoolplacer.cpp +++ b/linden/indra/newview/lltoolplacer.cpp | |||
| @@ -88,7 +88,7 @@ LLToolPlacer::LLToolPlacer() | |||
| 88 | BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj, S32* hit_face, | 88 | BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj, S32* hit_face, |
| 89 | BOOL* b_hit_land, LLVector3* ray_start_region, LLVector3* ray_end_region, LLViewerRegion** region ) | 89 | BOOL* b_hit_land, LLVector3* ray_start_region, LLVector3* ray_end_region, LLViewerRegion** region ) |
| 90 | { | 90 | { |
| 91 | F32 max_dist_from_camera = gSavedSettings.getF32( "MaxSelectDistance" ) - 1.f; | 91 | F32 max_dist_from_camera = gHippoLimits->getMaxSelectDistance() - 1.f; |
| 92 | 92 | ||
| 93 | // Viewer-side pick to find the right sim to create the object on. | 93 | // Viewer-side pick to find the right sim to create the object on. |
| 94 | // First find the surface the object will be created on. | 94 | // First find the surface the object will be created on. |