Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/indra/newview/lltoolplacer.h
+++ b/indra/newview/lltoolplacer.h
@@ -62,6 +62,7 @@ protected:

 private:
 	BOOL addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics );
+	S32  getTreeGrassSpecies(std::map<std::string, S32> &table, const char *control, S32 max);
 	BOOL raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj, S32* hit_face, 
 							  BOOL* b_hit_land, LLVector3* ray_start_region, LLVector3* ray_end_region, LLViewerRegion** region );
 	BOOL addDuplicate(S32 x, S32 y);