diff options
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 55 |
2 files changed, 42 insertions, 17 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 25dec01..90410fb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llinventoryview.cpp: | ||
4 | Cosmetic code cleanup in LLInventoryViewFinder. | ||
5 | |||
6 | |||
3 | * linden/indra/newview/llinventoryview.cpp: | 7 | * linden/indra/newview/llinventoryview.cpp: |
4 | Removed some dead code in LLInventoryViewFinder. | 8 | Removed some dead code in LLInventoryViewFinder. |
5 | 9 | ||
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index f7147b6..a265906 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
@@ -210,6 +210,7 @@ void LLInventoryViewFinder::changeFilter(LLInventoryFilter* filter) | |||
210 | updateElementsFromFilter(); | 210 | updateElementsFromFilter(); |
211 | } | 211 | } |
212 | 212 | ||
213 | |||
213 | void LLInventoryViewFinder::updateElementsFromFilter() | 214 | void LLInventoryViewFinder::updateElementsFromFilter() |
214 | { | 215 | { |
215 | if (!mFilter) | 216 | if (!mFilter) |
@@ -221,27 +222,47 @@ void LLInventoryViewFinder::updateElementsFromFilter() | |||
221 | LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState(); | 222 | LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState(); |
222 | U32 hours = mFilter->getHoursAgo(); | 223 | U32 hours = mFilter->getHoursAgo(); |
223 | 224 | ||
224 | // update the ui elements | 225 | // Update floater title |
225 | LLFloater::setTitle(mFilter->getName()); | 226 | LLFloater::setTitle(mFilter->getName()); |
226 | 227 | ||
227 | childSetValue("check_animation", (S32) (filter_types & LLInventoryType::NIT_ANIMATION)); | 228 | // Update type check boxes |
228 | childSetValue("check_bodypart", (S32) (filter_types & LLInventoryType::NIT_BODYPART)); | 229 | childSetValue("check_animation", |
229 | childSetValue("check_calling_card", (S32) (filter_types & LLInventoryType::NIT_CALLCARD)); | 230 | (S32)(filter_types & LLInventoryType::NIT_ANIMATION)); |
230 | childSetValue("check_clothing", (S32) (filter_types & LLInventoryType::NIT_CLOTHING)); | 231 | childSetValue("check_bodypart", |
231 | childSetValue("check_gesture", (S32) (filter_types & LLInventoryType::NIT_GESTURE)); | 232 | (S32)(filter_types & LLInventoryType::NIT_BODYPART)); |
232 | childSetValue("check_landmark", (S32) (filter_types & LLInventoryType::NIT_LANDMARK)); | 233 | childSetValue("check_calling_card", |
233 | childSetValue("check_notecard", (S32) (filter_types & LLInventoryType::NIT_NOTECARD)); | 234 | (S32)(filter_types & LLInventoryType::NIT_CALLCARD)); |
234 | childSetValue("check_object", (S32) (filter_types & LLInventoryType::NIT_OBJECT)); | 235 | childSetValue("check_clothing", |
235 | childSetValue("check_script", (S32) (filter_types & LLInventoryType::NIT_SCRIPT_LSL2)); | 236 | (S32)(filter_types & LLInventoryType::NIT_CLOTHING)); |
236 | childSetValue("check_sound", (S32) (filter_types & LLInventoryType::NIT_SOUND)); | 237 | childSetValue("check_gesture", |
237 | childSetValue("check_texture", (S32) (filter_types & LLInventoryType::NIT_TEXTURE)); | 238 | (S32)(filter_types & LLInventoryType::NIT_GESTURE)); |
238 | childSetValue("check_snapshot", (S32) (filter_types & LLInventoryType::NIT_SNAPSHOT)); | 239 | childSetValue("check_landmark", |
239 | childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS); | 240 | (S32)(filter_types & LLInventoryType::NIT_LANDMARK)); |
240 | childSetValue("check_since_logoff", mFilter->isSinceLogoff()); | 241 | childSetValue("check_notecard", |
241 | mSpinSinceHours->set((F32)(hours % 24)); | 242 | (S32)(filter_types & LLInventoryType::NIT_NOTECARD)); |
242 | mSpinSinceDays->set((F32)(hours / 24)); | 243 | childSetValue("check_object", |
244 | (S32)(filter_types & LLInventoryType::NIT_OBJECT)); | ||
245 | childSetValue("check_script", | ||
246 | (S32)(filter_types & LLInventoryType::NIT_SCRIPT_LSL2)); | ||
247 | childSetValue("check_sound", | ||
248 | (S32)(filter_types & LLInventoryType::NIT_SOUND)); | ||
249 | childSetValue("check_texture", | ||
250 | (S32)(filter_types & LLInventoryType::NIT_TEXTURE)); | ||
251 | childSetValue("check_snapshot", | ||
252 | (S32)(filter_types & LLInventoryType::NIT_SNAPSHOT)); | ||
253 | |||
254 | // Update other check boxes | ||
255 | childSetValue("check_show_empty", | ||
256 | show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS); | ||
257 | childSetValue("check_since_logoff", | ||
258 | mFilter->isSinceLogoff()); | ||
259 | |||
260 | // Update hours and days spinners | ||
261 | mSpinSinceHours->set( (F32)(hours % 24) ); | ||
262 | mSpinSinceDays->set( (F32)(hours / 24) ); | ||
243 | } | 263 | } |
244 | 264 | ||
265 | |||
245 | void LLInventoryViewFinder::rebuildFilter() | 266 | void LLInventoryViewFinder::rebuildFilter() |
246 | { | 267 | { |
247 | U32 filter = LLInventoryType::NIT_ALL; | 268 | U32 filter = LLInventoryType::NIT_ALL; |