rebase for the 4th time

Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp

@@ -182,7 +182,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 
 	Initialise();
 
-#ifdef __PSVITA__
+#if !defined DISABLE_PSN && defined __PSVITA__
     if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
     {
         g_NetworkManager.startAdhocMatching();			// create the client matching context and clear out the friends list
@@ -1559,7 +1559,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 				return;
 			}
 
-#ifdef __PSVITA__
+#if !defined DISABLE_PSN && defined __PSVITA__
 			if(CGameNetworkManager::usingAdhocMode() && !SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
 			{
 				// not connected to adhoc anymore, must have connected back to PSN to buy texture pack so sign in again
@@ -2232,6 +2232,9 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora
 {
 	UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
 
+#ifdef DISABLE_PSN
+	UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(pClass, true, iPad);
+#else
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 		SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack, pClass);
@@ -2241,6 +2244,7 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora
 		pClass->m_bIgnoreInput = false;
 	}
 
+#endif
 	return 0;
 }