diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 18:29:59 -0700 |
| commit | 33c230b46d17a2064994991763643a239e12e2c2 (patch) | |
| tree | 3af380efd9b3f67b26cc8b3c9c5a0fdd1549dd6d | |
| parent | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (diff) | |
A few more merge error fixes.
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 24 | ||||
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
3 files changed, 13 insertions, 16 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index bac02e30bf..3ee529aedf 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1851,11 +1851,6 @@ bool LLInventoryModel::loadSkeleton( typedef std::set<LLPointer<LLViewerInventoryCategory>, InventoryIDPtrLess> cat_set_t; cat_set_t temp_cats; - - update_map_t child_counts; - - LLUUID id; - LLAssetType::EType preferred_type; bool rv = true; for(LLSD::array_const_iterator it = options.beginArray(), @@ -1898,6 +1893,7 @@ bool LLInventoryModel::loadSkeleton( S32 cached_item_count = 0; if(!temp_cats.empty()) { + update_map_t child_counts; cat_array_t categories; item_array_t items; std::string owner_id_str; @@ -2096,15 +2092,15 @@ bool LLInventoryModel::loadMeat(const LLSD& options, const LLUUID& owner_id) if(llsd_perm_mask.isDefined()) { PermissionMask perm_mask = llsd_perm_mask.asInteger(); - default_perm.initMasks( - perm_mask, perm_mask, perm_mask, perm_mask, perm_mask); - } - else - { - default_perm.initMasks( - PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE); - } - item->setPermissions(default_perm); + default_perm.initMasks( + perm_mask, perm_mask, perm_mask, perm_mask, perm_mask); + } + else + { + default_perm.initMasks( + PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE, PERM_NONE); + } + item->setPermissions(default_perm); item->setAssetUUID(data_id.asUUID()); } diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 75df49e5e3..9afb8468ef 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -432,7 +432,7 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask) if ( KEY_F2 == key ) { llinfos << "Spawning floater TOS window" << llendl; - LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,""); + LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,"", 0); tos_dialog->startModal(); return TRUE; } diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index bcb3853106..f314de8cfe 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1,4 +1,4 @@ -/** +llvi/** * @file llviewerparcelmgr.cpp * @brief Viewer-side representation of owned land * @@ -58,6 +58,7 @@ #include "llparcelselection.h" #include "llresmgr.h" #include "llsdutil.h" +#include "llsdutil_math.h" #include "llstatusbar.h" #include "llui.h" #include "llviewerimage.h" |