DRTVWR-589 - support for rezing prims

3 files changed, 36 insertions, 3 deletions

diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index c1e111f0ac..bdf8fc0278 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -48,6 +48,7 @@
 #include "llanimationstates.h"
 #include "llinventoryfunctions.h"
 #include "stringize.h"
+#include "lltoolplacer.h"
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -570,6 +571,28 @@ lua_function(add_branch)
     return 0;
 }
 
+// rez_prim({x, y}, prim_type)
+// avatar is the reference point
+lua_function(rez_prim)
+{
+    lua_rawgeti(L, 1, 1);
+    F32 x = lua_tonumber(L, -1);
+    lua_pop(L, 1);
+    lua_rawgeti(L, 1, 2);
+    F32 y = lua_tonumber(L, -1);
+    lua_pop(L, 1);
+
+    S32 type(lua_tonumber(L, 2));  // primitive shapes 1-8
+
+    LLVector3 obj_pos = gAgent.getPositionAgent() + LLVector3(x, y, -0.5);
+    bool res = LLToolPlacer::rezNewObject(type, NULL, 0, TRUE, gAgent.getPositionAgent(), obj_pos, gAgent.getRegion(), 0);
+
+    LL_INFOS() << "Rezing a prim: type " << LLPrimitive::pCodeToString(type) << ", coordinates: " << obj_pos << " Success: " << res << LL_ENDL;
+
+    lua_pop(L, lua_gettop(L));
+    return 0;
+}
+
 lua_function(run_ui_command)
 {
 	int top = lua_gettop(L);
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index 7cdd7cc5c8..a4e6d20181 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -164,13 +164,17 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	BOOL b_hit_land = FALSE;
 	S32 hit_face = -1;
 	LLViewerObject* hit_obj = NULL;
-	U8 state = 0;
 	BOOL success = raycastForNewObjPos( x, y, &hit_obj, &hit_face, &b_hit_land, &ray_start_region, &ray_end_region, &regionp );
 	if( !success )
 	{
 		return FALSE;
 	}
+    return rezNewObject(pcode,hit_obj, hit_face, b_hit_land, ray_start_region, ray_end_region, regionp, use_physics);
+}
 
+BOOL LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit_face, BOOL b_hit_land, LLVector3 ray_start_region,
+    LLVector3 ray_end_region, LLViewerRegion* regionp, U8 use_physics)
+{
 	if( hit_obj && (hit_obj->isAvatar() || hit_obj->isAttachment()) )
 	{
 		// Can't create objects on avatars or attachments
@@ -194,6 +198,8 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	U8				material = LL_MCODE_WOOD;
 	BOOL			create_selected = FALSE;
 	LLVolumeParams	volume_params;
+
+    U8 state = 0;
 	
 	switch (pcode) 
 	{
diff --git a/indra/newview/lltoolplacer.h b/indra/newview/lltoolplacer.h
index ad59cb0daa..d20d682710 100644
--- a/indra/newview/lltoolplacer.h
+++ b/indra/newview/lltoolplacer.h
@@ -50,12 +50,16 @@ public:
 	static void	setObjectType( LLPCode type )		{ sObjectType = type; }
 	static LLPCode getObjectType()					{ return sObjectType; }
 
+    static BOOL addObject(LLPCode pcode, S32 x, S32 y, U8 use_physics);
+    static BOOL rezNewObject(LLPCode pcode, LLViewerObject* hit_obj, S32 hit_face, BOOL b_hit_land, LLVector3 ray_start_region,
+                             LLVector3 ray_end_region, LLViewerRegion *regionp, U8 use_physics);
+
 protected:
 	static LLPCode	sObjectType;
 
 private:
-	BOOL addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics );
-	BOOL raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj, S32* hit_face, 
+	
+	static 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);
 };