diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0bbe36a69..7a130f8fb 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2669,8 +2669,9 @@ bool idle_startup()
 		if (!gAgent.isFirstLogin())
 		{
 			bool url_ok = LLURLSimString::sInstance.parse();
-			if (!url_ok && ((agent_start_location == "last" && gSavedSettings.getBOOL("LoginLastLocation")) ||
-						(agent_start_location == "home" && !gSavedSettings.getBOOL("LoginLastLocation"))))
+			if (!((agent_start_location == "url" && url_ok) ||
+                  (!url_ok && ((agent_start_location == "last" && gSavedSettings.getBOOL("LoginLastLocation")) ||
+							   (agent_start_location == "home" && !gSavedSettings.getBOOL("LoginLastLocation"))))))
 			{
 				// The reason we show the alert is because we want to
 				// reduce confusion for when you log in and your provided
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index aea7b6819..ed1ec7940 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -4270,7 +4270,14 @@ Visit the Second Life Support Web site?
      notext="Cancel"
      yestext="Go"/>
   </notification>
-
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportUrl"
+   type="alertmodal">
+This grid has no link for support.
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="ConfirmQuit"
@@ -5112,6 +5119,51 @@ Would you like to visit the Second Life website to set this up?
    type="alertmodal">
 The string [STRING_NAME] is missing from strings.xml
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="GridsNoNick"
+   type="alertmodal">
+Cannot save new grid information.
+You need to specify a unique grid nickname.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridsNoLoginUri"
+   type="alertmodal">
+Cannot save new grid '[NAME]'.
+You need to specify a login URI.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridExists"
+   type="alertmodal">
+Cannot save new grid '[NAME]'.
+A grid with the same nickname already exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridInfoNoLoginUri"
+   type="alertmodal">
+A login URI is required to retrieve the grid info.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridInfoError"
+   type="alertmodal">
+Cannot retrieve grid info from server.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpRenderCompat"
+   type="alertmodal">
+Builds with extended hollow or extended hole size do not render properly on other viewers. Please keep this option checked, if you want your builds looking properly in other viewers.
+  </notification>
 
   <notification
    icon="notifytip.tga"