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/llinventorybridge.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 729165a2a4..e948b64459 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -180,7 +180,7 @@ PermissionMask LLInvFVBridge::getPermissionMask() const
 }
 
 // Folders don't have creation dates.
-U32 LLInvFVBridge::getCreationDate() const
+time_t LLInvFVBridge::getCreationDate() const
 {
 	return 0;
 }
@@ -894,7 +894,7 @@ LLString LLItemBridge::getLabelSuffix() const
 	return suffix;
 }
 
-U32 LLItemBridge::getCreationDate() const
+time_t LLItemBridge::getCreationDate() const
 {
 	LLViewerInventoryItem* item = getItem();
 	if (item)
-- 
cgit v1.3