From e702838d5606dcc5a33afda75bf07d63e6fdc848 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 18 May 2012 17:56:13 +0200
Subject: [PATCH] Cleared open merge issue in llscriptfloater.cpp: The bottom
 tray is dead and gone

---
 indra/newview/llscriptfloater.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 226b232590..c5009bd50d 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -140,14 +140,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
 			S32 width=pos.getWidth();
 			S32 height=pos.getHeight();
 
-			// ND_MERGE LLBottomTray is gone
-			//			pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
-			//					 LLBottomTray::instance().getRect().getHeight(),
-			//					 width,height);
 			pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
 								 gViewerWindow->getWorldViewHeightScaled()-height,
 								 width,height);
-			// /ND_MERGE
 
 			floater->setRect(pos);
 			floater->savePosition();