diff options
author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/lltoolbrush.h | |
parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) |
merge changes for MAINT-4356
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; |