Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

indra/newview/aihttpview.cpp

@@ -80,6 +80,7 @@ void AIServiceBar::draw()
   U32 is_used;
   U32 is_inuse;
   int total_added;
+  int event_polls;
   int established_connections;
   int concurrent_connections;
   size_t bandwidth;
@@ -88,6 +89,7 @@ void AIServiceBar::draw()
 	is_used = per_service_r->is_used();
 	is_inuse = per_service_r->is_inuse();
 	total_added = per_service_r->mTotalAdded;
+	event_polls = per_service_r->mEventPolls;
 	established_connections = per_service_r->mEstablishedConnections;
 	concurrent_connections = per_service_r->mConcurrentConnections;
 	bandwidth = per_service_r->bandwidth().truncateData(AIHTTPView::getTime_40ms());
@@ -148,7 +150,7 @@ void AIServiceBar::draw()
   }
   start = mHTTPView->updateColumn(mc_col, start);
 #if defined(CWDEBUG) || defined(DEBUG_CURLIO)
-  text = llformat(" | %d,%d/%d", total_added, established_connections, concurrent_connections);
+  text = llformat(" | %d,%d,%d/%d", total_added, event_polls, established_connections, concurrent_connections);
 #else
   text = llformat(" | %d/%d", total_added, concurrent_connections);
 #endif
@@ -227,6 +229,7 @@ void AIGLHTTPHeaderBar::draw(void)
   height -= sLineHeight;
   start = h_offset;
   text = "Service (host:port)";
+  // This must match AICapabilityType!
   static char const* caption[number_of_capability_types] = {
 	" | Textures", " | Inventory", " | Mesh", " | Other"
   };

indra/newview/app_settings/settings.xml

@@ -17663,7 +17663,7 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>DAEExportTextures</key>
     <map>

indra/newview/lleventpoll.cpp

@@ -75,6 +75,7 @@ namespace
 		void handleMessage(const LLSD& content);
 		/*virtual*/ void error(U32 status, const std::string& reason);
 		/*virtual*/ void result(const LLSD&	content);
+		/*virtual*/ bool is_event_poll(void) const { return true; }
 		/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return eventPollResponder_timeout; }
 		/*virtual*/ char const* getName(void) const { return "LLEventPollResponder"; }
 

indra/newview/llpanellogin.cpp

@@ -215,6 +215,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	
 	LLComboBox *server_choice_combo = getChild<LLComboBox>("grids_combo");
 	server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectGrid, _1));
+	server_choice_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onSelectGrid, server_choice_combo));
 	
 	// Load all of the grids, sorted, and then add a bar and the current grid at the top
 	updateGridCombo();
@@ -1031,7 +1032,33 @@ void LLPanelLogin::refreshLoginPage()
 //void LLPanelLogin::onSelectServer()
 void LLPanelLogin::onSelectGrid(LLUICtrl *ctrl)
 {
-	gHippoGridManager->setCurrentGrid(ctrl->getValue());
+	std::string grid(ctrl->getValue().asString());
+	LLStringUtil::trim(grid); // Guard against copy paste
+	if (!gHippoGridManager->getGrid(grid)) // We can't get an input grid by name or nick, perhaps a Login URI was entered
+	{
+		HippoGridInfo* info(new HippoGridInfo("")); // Start off with empty grid name, otherwise we don't know what to name
+		info->setLoginUri(grid);
+		if (info->retrieveGridInfo()) // There's info from this URI
+		{
+			grid = info->getGridName();
+			if (HippoGridInfo* nick_info = gHippoGridManager->getGrid(info->getGridNick())) // Grid of same nick exists
+			{
+				delete info;
+				grid = nick_info->getGridName();
+			}
+			else // Guess not, try adding this grid
+			{
+				gHippoGridManager->addGrid(info); // deletes info if not needed (existing or no name)
+			}
+		}
+		else
+		{
+			delete info;
+			grid = gHippoGridManager->getCurrentGridName();
+		}
+	}
+	gHippoGridManager->setCurrentGrid(grid);
+	ctrl->setValue(grid);
 }
 
 void LLPanelLogin::onLocationSLURL()

indra/newview/llsurfacepatch.cpp

@@ -304,6 +304,12 @@ void LLSurfacePatch::calcNormal(const U32 x, const U32 y, const U32 stride)
 				if (!ppatches[i][j]->getNeighborPatch(SOUTH))
 				{
 					poffsets[i][j][1] = 0;
+				}
+				else
+				{
+// <FS:CR> Aurora Sim
+					ppatches[i][j] = ppatches[i][j]->getNeighborPatch(SOUTH);
+					poffsets[i][j][1] += patch_width;
 					poffsets[i][j][2] = ppatches[i][j]->getSurface()->getGridsPerEdge();
 // </FS>CR> Aurora Sim
 				}

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

@@ -53,7 +53,7 @@
 	     left="0" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
         Grid:
       </text>
-      <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|bottom" height="20"
+      <combo_box allow_text_entry="true" max_chars="128" bottom_delta="-24" follows="left|bottom" height="20"
            left="0" mouse_opaque="true" name="grids_combo" width="120" />
       <button name="grids_btn" label="Grid Manager"
           bottom_delta="-20" left_delta="10" height="16" width="100"

indra/newview/skins/default/xui/pt/panel_login.xml

@@ -17,7 +17,7 @@
       <text name="grids_combo_text">
         Grelha:
       </text>
-      <!--<button name="grids_btn" label="Administrar Grid"/>-->
+      <button name="grids_btn" label="Administrar Grid"/>
     </layout_panel>
     <layout_panel name="location_panel">
       <text name="start_location_text">