diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:00:23 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-09-18 17:00:23 -0700 |
| commit | 951c83724d7e364ac52cbee2d657711fda7d2c26 (patch) | |
| tree | 20b95debd0a3bb52f32df0db52d6dc91caf5793f /indra/newview/lltoolbrush.h | |
| parent | 78304e398fa7d4604eac98247173b33d712ec135 (diff) | |
| parent | 61fb8c3fe31c73ce9121daac545aa7c8fc79ec8c (diff) | |
Merged in viewer-tiger
Diffstat (limited to 'indra/newview/lltoolbrush.h')
| -rwxr-xr-x | indra/newview/lltoolbrush.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h index 1c7f198900..2ec6911de9 100755 --- a/indra/newview/lltoolbrush.h +++ b/indra/newview/lltoolbrush.h @@ -81,10 +81,14 @@ protected: const LLVector3& pos_world); // Does region allow terraform, or are we a god? - bool canTerraform(LLViewerRegion* regionp) const; + bool canTerraformRegion(LLViewerRegion* regionp) const; + + bool canTerraformParcel(LLViewerRegion* regionp) const; // Modal dialog that you can't terraform the region - void alertNoTerraform(LLViewerRegion* regionp); + void alertNoTerraformRegion(LLViewerRegion* regionp); + + void alertNoTerraformParcel(); protected: F32 mStartingZ; |