Splash page in Grid Manager

indra/newview/hippopanelgrids.cpp

@@ -128,7 +128,7 @@ BOOL HippoPanelGridsImpl::postBuild()
 	requires<LLLineEditor>("support");
 	requires<LLLineEditor>("register");
 	requires<LLLineEditor>("password");
-	//requires<LLLineEditor>("search");
+	requires<LLLineEditor>("search");
 	requires<LLButton>("btn_delete");
 	requires<LLButton>("btn_add");
 	requires<LLButton>("btn_copy");
@@ -204,14 +204,14 @@ void HippoPanelGridsImpl::refresh()
 		bool enablePlatform = (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP) ||
 			(mCurGrid != gHippoGridManager->getConnectedGrid()->getGridNick());
 		childSetEnabled("platform", enablePlatform);
-		//childSetEnabled("search", false);
-		//childSetText("search", LLStringExplicit(""));
+		childSetEnabled("search", false);
+		childSetText("search", LLStringExplicit(""));
 		childSetEnabled("render_compat", false);
 		childSetValue("render_compat", false);
 	} else {
 		childSetEnabled("platform", true);
-		//childSetEnabled("search", true);
-		//childSetText("search", gridInfo->getSearchUrl());
+		childSetEnabled("search", true);
+		childSetText("search", gHippoGridManager->getConnectedGrid()->getSearchUrl());
 		childSetEnabled("render_compat", true);
 	}
 }
@@ -357,7 +357,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
 	gridInfo->setSupportUrl(childGetValue("support"));
 	gridInfo->setRegisterUrl(childGetValue("register"));
 	gridInfo->setPasswordUrl(childGetValue("password"));
-	//gridInfo->setSearchUrl(childGetValue("search"));
+	gridInfo->setSearchUrl(childGetValue("search"));
 	gridInfo->setRenderCompat(childGetValue("render_compat"));
 	
 	refresh();
@@ -413,7 +413,7 @@ void HippoPanelGridsImpl::retrieveGridInfo()
 		if (grid->getSupportUrl() != "") childSetText("support", grid->getSupportUrl());
 		if (grid->getRegisterUrl() != "") childSetText("register", grid->getRegisterUrl());
 		if (grid->getPasswordUrl() != "") childSetText("password", grid->getPasswordUrl());
-		//if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
+		if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
 	} else {
 		LLNotifications::instance().add("GridInfoError");
 	}

indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml

@@ -76,29 +76,13 @@
 	<combo_box max_chars="20" allow_text_entry="false" name="platform"
 		height="18" width="200" left="120" bottom_delta="-4"
 		follows="left|top" mouse_opaque="true" />
-	<!-- Grid Nickname -->
-	<text type="string" length="1" enabled="true" name="gridnick_label" 
-		height="10" width="100" left="12" bottom_delta="-22"
-		h_pad="0" v_pad="0" halign="left" 
-		font="SansSerifSmall" 
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
-		Grid Nickname:
-	</text>
-	<line_editor max_length="25" enabled="false" name="gridnick" 
-		handle_edit_keys_directly="true" 
-		height="18" width="175" left="120" bottom_delta="-4"
-		halign="right"
-		font="SansSerifSmall"
-		follows="left|top" border_visible="false" mouse_opaque="false"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
 	<!-- Grid Name -->
 	<text type="string" length="1" enabled="true" name="gridname_label" 
 		height="10" width="100" left="12" bottom_delta="-20"
 		h_pad="0" v_pad="0" halign="left" 
 		font="SansSerifSmall" 
 		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
+		drop_shadow_visible="true" border_drop_shadow_visible="false">
 		Grid Name:
 	</text>
 	<line_editor max_length="254" enabled="true" name="gridname" 
@@ -108,6 +92,22 @@
 		font="SansSerifSmall"
 		follows="left|top|right" border_visible="false" mouse_opaque="false"
 		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+	<!-- Grid Splash Page -->
+	<text type="string" length="1" enabled="true" name="loginpage_label" 
+		height="10" width="100" left="12" bottom_delta="-22"
+		h_pad="0" v_pad="0" halign="left" 
+		font="SansSerifSmall" 
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+		drop_shadow_visible="true" border_drop_shadow_visible="false">
+		Splash Page:
+	</text>
+	<line_editor max_length="254" enabled="true" name="loginpage" 
+		handle_edit_keys_directly="true" 
+		height="18" left="120" right="-12" bottom_delta="-4"
+		halign="right"
+		font="SansSerifSmall"
+		follows="left|top|right" border_visible="false" mouse_opaque="false"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
 	<!-- Helper URI -->
 	<text type="string" length="1" enabled="true" name="helperuri_label" 
 		height="10" width="100" left="12" bottom_delta="-20"
@@ -189,7 +189,6 @@
 		follows="left|top|right" border_visible="false" mouse_opaque="false"
 		drop_shadow_visible="true" border_drop_shadow_visible="false" />
     <!-- Search URL -->
-	<!--
     <text type="string" length="1" enabled="true" name="search_label"
 		height="10" width="100" left="12" bottom_delta="-20"
 		h_pad="0" v_pad="0" halign="left"
@@ -205,7 +204,6 @@
 		font="SansSerifSmall"
 		follows="left|top|right" border_visible="false" mouse_opaque="false"
 		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-	-->
     <!-- Rendering Compatibility -->
 	<check_box enabled="true" radio_style="false" 
 		label="Rendering Compatibility" name="render_compat"

indra/newview/viewer_manifest.py

@@ -793,6 +793,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libalut.so")
             self.path("libopenal.so", "libopenal.so.1")
             self.path("libtcmalloc_minimal.so.0")
+            self.path("libtcmalloc_minimal.so.0.0.0")
             self.end_prefix("lib")