diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
| commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
| tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/llfloatergodtools.cpp | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
| parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
| -rwxr-xr-x | indra/newview/llfloatergodtools.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 6966ca5639..37774fbc5c 100755 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -401,14 +401,9 @@ void LLFloaterGodTools::sendGodUpdateRegionInfo() // Floats because spinners only support floats. JC const F32 BILLABLE_FACTOR_DEFAULT = 1; -const F32 BILLABLE_FACTOR_MIN = 0.0f; -const F32 BILLABLE_FACTOR_MAX = 4.f; // floats because spinners only understand floats. JC const F32 PRICE_PER_METER_DEFAULT = 1.f; -const F32 PRICE_PER_METER_MIN = 0.f; -const F32 PRICE_PER_METER_MAX = 100.f; - LLPanelRegionTools::LLPanelRegionTools() : LLPanel() @@ -833,9 +828,6 @@ void LLPanelRegionTools::onSelectRegion() // ^ ^ ^ // LEFT R2 RIGHT -const F32 HOURS_TO_RADIANS = (2.f*F_PI)/24.f; - - LLPanelGridTools::LLPanelGridTools() : LLPanel() { |