diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-10-09 16:10:00 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-10-09 16:10:00 -0700 |
| commit | f9113c286fae143962f1d79663e66a303c46ce51 (patch) | |
| tree | 9190363e14749efdb3f46de02c67c377a0b9718e /indra/newview/lltoolbrush.h | |
| parent | 873a72fdbad8bca29cf8129b318719c1af5f8e9d (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
Merge
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; |