diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bac02e30bfd601842733b94b803f2ca1b12b089c..3ee529aedfbc1324bfa930459334258c3ffee55a 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 75df49e5e37d7a90b541a6c48d2ed5bbd86e3ecb..9afb8468eff8050103ebd59487577094a7f09a75 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 bcb3853106fcf2667e89a81ebff1e8544ca32513..f314de8cfeb50bd2e41a95264ccaa94720a472fd 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"