diff options
Diffstat (limited to 'linden/indra/newview/llfloaterland.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterland.cpp | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp index a6f39cb..9af9ddc 100644 --- a/linden/indra/newview/llfloaterland.cpp +++ b/linden/indra/newview/llfloaterland.cpp | |||
@@ -2098,51 +2098,15 @@ void LLPanelLandOptions::refreshSearch() | |||
2098 | 2098 | ||
2099 | std::string tooltip; | 2099 | std::string tooltip; |
2100 | bool enable_show_directory = false; | 2100 | bool enable_show_directory = false; |
2101 | // Parcels <= 128 square meters cannot be listed in search, in an | 2101 | if (can_change) |
2102 | // effort to reduce search spam from small parcels. See also | 2102 | { |
2103 | // the search crawler "grid-crawl.py" in secondlife.com/doc/app/search/ JC | 2103 | tooltip = getString("search_enabled_tooltip"); |
2104 | const S32 MIN_PARCEL_AREA_FOR_SEARCH = 128; | 2104 | enable_show_directory = true; |
2105 | bool large_enough = parcel->getArea() > MIN_PARCEL_AREA_FOR_SEARCH; | ||
2106 | if (large_enough) | ||
2107 | { | ||
2108 | if (can_change) | ||
2109 | { | ||
2110 | tooltip = getString("search_enabled_tooltip"); | ||
2111 | enable_show_directory = true; | ||
2112 | } | ||
2113 | else | ||
2114 | { | ||
2115 | tooltip = getString("search_disabled_permissions_tooltip"); | ||
2116 | enable_show_directory = false; | ||
2117 | } | ||
2118 | } | 2105 | } |
2119 | else | 2106 | else |
2120 | { | 2107 | { |
2121 | // not large enough to include in search | 2108 | tooltip = getString("search_disabled_permissions_tooltip"); |
2122 | if (can_change) | 2109 | enable_show_directory = false; |
2123 | { | ||
2124 | if (show_directory) | ||
2125 | { | ||
2126 | // parcels that are too small, but are still in search for | ||
2127 | // legacy reasons, need to have the check box enabled so | ||
2128 | // the owner can delist the parcel. JC | ||
2129 | tooltip = getString("search_enabled_tooltip"); | ||
2130 | enable_show_directory = true; | ||
2131 | } | ||
2132 | else | ||
2133 | { | ||
2134 | tooltip = getString("search_disabled_small_tooltip"); | ||
2135 | enable_show_directory = false; | ||
2136 | } | ||
2137 | } | ||
2138 | else | ||
2139 | { | ||
2140 | // both too small and don't have permission, so just | ||
2141 | // show the permissions as the reason (which is probably | ||
2142 | // the more common case) JC | ||
2143 | tooltip = getString("search_disabled_permissions_tooltip"); | ||
2144 | enable_show_directory = false; | ||
2145 | } | ||
2146 | } | 2110 | } |
2147 | mCheckShowDirectory->setToolTip(tooltip); | 2111 | mCheckShowDirectory->setToolTip(tooltip); |
2148 | mCategoryCombo->setToolTip(tooltip); | 2112 | mCategoryCombo->setToolTip(tooltip); |