From 03f6734f4367b08e2b181ed68bc80b885e76148f Mon Sep 17 00:00:00 2001
From: Tom
Date: Wed, 7 Sep 2011 09:42:18 -0700
Subject: First set of merge fixes

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9ec8a42..0c1da47 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2166,8 +2166,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 UUID x = module.CreateNPC(firstname,
                                           lastname,
                                           new Vector3((float) position.x, (float) position.y, (float) position.z),
-                                          World,
-                                          appearance);
+                                          World,appearance);
 
                 return new LSL_Key(x.ToString());
             }
-- 
cgit v1.1