diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/newview/llinventorybridge.cpp | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
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
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |