Commits

Scott Lawrence  committed 9a78ac1 Merge

merge changes for storm-1852

  • Participants
  • Parent commits 967c92c, 1563238
  • Tags DRTVWR-157

Comments (0)

Files changed (2)

File doc/contributions.txt

 	STORM-1793
 	STORM-1810
 	STORM-1860
+	STORM-1852
 	STORM-1858
 	STORM-1862
 Kadah Coba

File indra/newview/llviewerobject.cpp

 		{	// This will put the object underground, but we can't tell if it will stop 
 			// at ground level or not
 			min_height = LLWorld::getInstance()->getMinAllowedZ(this, new_pos_global);
+			// Cap maximum height
+			new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]);
 		}
 
 		new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]);
-		new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]);
 
 		// Check to see if it's going off the region
 		LLVector3 temp(new_pos);