From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/newview/llviewermenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewermenu.cpp')

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index fd2a906edd..060b69db74 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6982,7 +6982,7 @@ void handle_grab_texture(void* data)
 						   PERM_NONE,
 						   PERM_NONE,
 						   next_owner_perm);
-			S32 creation_date_now = time_corrected();
+			time_t creation_date_now = time_corrected();
 			LLPointer<LLViewerInventoryItem> item
 				= new LLViewerInventoryItem(item_id,
 											folder_id,
-- 
cgit v1.2.3