Anonymous avatar Anonymous committed 67ed208

SH-1444 FIXED "Allow mesh objects" setting is visible on non-mesh region.

Comments (0)

Files changed (1)

indra/newview/llfloaterregioninfo.cpp

 
 	const bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && 
 		gAgent.getRegion() &&
-		!gAgent.getRegion()->getCapability("GetMesh").empty();
+		!gAgent.getRegion()->getCapability("GetMesh").empty() &&
+		!gAgent.getRegion()->getCapability("ObjectAdd").empty();
 	getChildView("mesh_rez_enabled_check")->setVisible(enable_mesh);
 	getChildView("mesh_rez_enabled_check")->setEnabled(getChildView("mesh_rez_enabled_check")->getEnabled() && enable_mesh);
 	// Data gets filled in by processRegionInfo
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.