Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts: # autobuild.xml # indra/llcommon/lluuid.cpp # indra/llprimitive/llmodel.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/zh/floater_about.xmlmaster
Ansariel
commit
2ff9900cd9
|
|
@ -3353,6 +3353,36 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
|
|||
<key>version</key>
|
||||
<string>0.54.1.555529</string>
|
||||
</map>
|
||||
<key>xxhash</key>
|
||||
<map>
|
||||
<key>copyright</key>
|
||||
<string>Copyright 2012-2020 Yann Collet</string>
|
||||
<key>description</key>
|
||||
<string>xxHash Extremely fast hash algorithm</string>
|
||||
<key>license</key>
|
||||
<string>bsd</string>
|
||||
<key>license_file</key>
|
||||
<string>LICENSES/xxhash.txt</string>
|
||||
<key>name</key>
|
||||
<string>xxhash</string>
|
||||
<key>platforms</key>
|
||||
<map>
|
||||
<key>common</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e4f77ba0a9b8ec3cc3fabc51c4da81d2</string>
|
||||
<key>url</key>
|
||||
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110070/956941/xxhash-0.8.1.578006-windows-578006.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>common</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>0.8.1</string>
|
||||
</map>
|
||||
<key>zlib-ng</key>
|
||||
<map>
|
||||
<key>canonical_repo</key>
|
||||
|
|
|
|||
|
|
@ -591,6 +591,7 @@ Henri Beauchamp
|
|||
VWR-1406
|
||||
VWR-4157
|
||||
SL-15175
|
||||
SL-19110
|
||||
herina Bode
|
||||
Hikkoshi Sakai
|
||||
VWR-429
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@ set(cmake_SOURCE_FILES
|
|||
VisualLeakDetector.cmake
|
||||
LibVLCPlugin.cmake
|
||||
XmlRpcEpi.cmake
|
||||
xxHash.cmake
|
||||
ZLIBNG.cmake
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ include(APR)
|
|||
include(Boost)
|
||||
include(EXPAT)
|
||||
include(Tracy)
|
||||
include(xxHash)
|
||||
include(ZLIBNG)
|
||||
|
||||
set(LLCOMMON_INCLUDE_DIRS
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
# -*- cmake -*-
|
||||
if (XXHASH_CMAKE_INCLUDED)
|
||||
return()
|
||||
endif (XXHASH_CMAKE_INCLUDED)
|
||||
set (XXHASH_CMAKE_INCLUDED TRUE)
|
||||
|
||||
include(Prebuilt)
|
||||
use_prebuilt_binary(xxhash)
|
||||
|
|
@ -118,6 +118,7 @@ set(llcommon_SOURCE_FILES
|
|||
lluriparser.cpp
|
||||
lluuid.cpp
|
||||
llworkerthread.cpp
|
||||
hbxxh.cpp
|
||||
u64.cpp
|
||||
threadpool.cpp
|
||||
workqueue.cpp
|
||||
|
|
@ -254,6 +255,7 @@ set(llcommon_HEADER_FILES
|
|||
llwin32headers.h
|
||||
llwin32headerslean.h
|
||||
llworkerthread.h
|
||||
hbxxh.h
|
||||
lockstatic.h
|
||||
stdtypes.h
|
||||
stringize.h
|
||||
|
|
|
|||
|
|
@ -0,0 +1,377 @@
|
|||
/**
|
||||
* @file hbxxh.cpp
|
||||
* @brief High performances vectorized hashing based on xxHash.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (c) 2023, Henri Beauchamp.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
// This define ensures that xxHash will be compiled within this module, with
|
||||
// vectorized (*) and inlined functions (with no exported API symbol); our
|
||||
// xxhash "pre-built library" package actually only contains the xxhash.h
|
||||
// header (no library needed at link time).
|
||||
// (*) SSE2 is normally used for x86(_64) builds, unless you enabled AVX2
|
||||
// in your build, in which case the latter would be used instead. For ARM64
|
||||
// builds, this would also automatically enable NEON vectorization.
|
||||
#define XXH_INLINE_ALL
|
||||
#include "xxhash/xxhash.h"
|
||||
|
||||
#include "hbxxh.h"
|
||||
|
||||
// How many bytes to grab at a time when hashing files or streams
|
||||
constexpr size_t BLOCK_LEN = 4096;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// HBXXH64 class
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//static
|
||||
U64 HBXXH64::digest(const void* buffer, size_t len)
|
||||
{
|
||||
return XXH3_64bits(buffer, len);
|
||||
}
|
||||
|
||||
//static
|
||||
U64 HBXXH64::digest(const char* str)
|
||||
{
|
||||
return XXH3_64bits((const void*)str, strlen(str));
|
||||
}
|
||||
|
||||
//static
|
||||
U64 HBXXH64::digest(const std::string& str)
|
||||
{
|
||||
return XXH3_64bits((const void*)str.c_str(), str.size());
|
||||
}
|
||||
|
||||
// Must be called by all constructors.
|
||||
void HBXXH64::init()
|
||||
{
|
||||
mDigest = 0;
|
||||
mState = (void*)XXH3_createState();
|
||||
if (!mState || XXH3_64bits_reset((XXH3_state_t*)mState) != XXH_OK)
|
||||
{
|
||||
LL_WARNS() << "Failed to initialize state !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
HBXXH64::~HBXXH64()
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_freeState((XXH3_state_t*)mState);
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH64::update(const void* buffer, size_t len)
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_64bits_update((XXH3_state_t*)mState, buffer, len);
|
||||
}
|
||||
else
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH64::update(const std::string& str)
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_64bits_update((XXH3_state_t*)mState, (const void*)str.c_str(),
|
||||
str.length());
|
||||
}
|
||||
else
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH64::update(std::istream& stream)
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
|
||||
char buffer[BLOCK_LEN];
|
||||
size_t len;
|
||||
while (stream.good())
|
||||
{
|
||||
stream.read(buffer, BLOCK_LEN);
|
||||
len = stream.gcount();
|
||||
XXH3_64bits_update((XXH3_state_t*)mState, (const void*)buffer, len);
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH64::update(FILE* file)
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
|
||||
char buffer[BLOCK_LEN];
|
||||
size_t len;
|
||||
while ((len = fread((void*)buffer, 1, BLOCK_LEN, file)))
|
||||
{
|
||||
XXH3_64bits_update((XXH3_state_t*)mState, (const void*)buffer, len);
|
||||
}
|
||||
fclose(file);
|
||||
}
|
||||
|
||||
void HBXXH64::finalize()
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Already finalized !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
mDigest = XXH3_64bits_digest((XXH3_state_t*)mState);
|
||||
XXH3_freeState((XXH3_state_t*)mState);
|
||||
mState = NULL;
|
||||
}
|
||||
|
||||
U64 HBXXH64::digest() const
|
||||
{
|
||||
return mState ? XXH3_64bits_digest((XXH3_state_t*)mState) : mDigest;
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& stream, HBXXH64 context)
|
||||
{
|
||||
stream << context.digest();
|
||||
return stream;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// HBXXH128 class
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//static
|
||||
LLUUID HBXXH128::digest(const void* buffer, size_t len)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits(buffer, len);
|
||||
LLUUID id;
|
||||
U64* data = (U64*)id.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
return id;
|
||||
}
|
||||
|
||||
//static
|
||||
LLUUID HBXXH128::digest(const char* str)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits((const void*)str, strlen(str));
|
||||
LLUUID id;
|
||||
U64* data = (U64*)id.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
return id;
|
||||
}
|
||||
|
||||
//static
|
||||
LLUUID HBXXH128::digest(const std::string& str)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits((const void*)str.c_str(), str.size());
|
||||
LLUUID id;
|
||||
U64* data = (U64*)id.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
return id;
|
||||
}
|
||||
|
||||
//static
|
||||
void HBXXH128::digest(LLUUID& result, const void* buffer, size_t len)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits(buffer, len);
|
||||
U64* data = (U64*)result.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
}
|
||||
|
||||
//static
|
||||
void HBXXH128::digest(LLUUID& result, const char* str)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits((const void*)str, strlen(str));
|
||||
U64* data = (U64*)result.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
}
|
||||
|
||||
//static
|
||||
void HBXXH128::digest(LLUUID& result, const std::string& str)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits((const void*)str.c_str(), str.size());
|
||||
U64* data = (U64*)result.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
}
|
||||
|
||||
// Must be called by all constructors.
|
||||
void HBXXH128::init()
|
||||
{
|
||||
mState = (void*)XXH3_createState();
|
||||
if (!mState || XXH3_128bits_reset((XXH3_state_t*)mState) != XXH_OK)
|
||||
{
|
||||
LL_WARNS() << "Failed to initialize state !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
HBXXH128::~HBXXH128()
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_freeState((XXH3_state_t*)mState);
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH128::update(const void* buffer, size_t len)
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_128bits_update((XXH3_state_t*)mState, buffer, len);
|
||||
}
|
||||
else
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH128::update(const std::string& str)
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH3_128bits_update((XXH3_state_t*)mState, (const void*)str.c_str(),
|
||||
str.length());
|
||||
}
|
||||
else
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH128::update(std::istream& stream)
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
|
||||
char buffer[BLOCK_LEN];
|
||||
size_t len;
|
||||
while (stream.good())
|
||||
{
|
||||
stream.read(buffer, BLOCK_LEN);
|
||||
len = stream.gcount();
|
||||
XXH3_128bits_update((XXH3_state_t*)mState, (const void*)buffer, len);
|
||||
}
|
||||
}
|
||||
|
||||
void HBXXH128::update(FILE* file)
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Cannot update a finalized digest !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
|
||||
char buffer[BLOCK_LEN];
|
||||
size_t len;
|
||||
while ((len = fread((void*)buffer, 1, BLOCK_LEN, file)))
|
||||
{
|
||||
XXH3_128bits_update((XXH3_state_t*)mState, (const void*)buffer, len);
|
||||
}
|
||||
fclose(file);
|
||||
}
|
||||
|
||||
void HBXXH128::finalize()
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
LL_WARNS() << "Already finalized !" << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
XXH128_hash_t hash = XXH3_128bits_digest((XXH3_state_t*)mState);
|
||||
U64* data = (U64*)mDigest.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
XXH3_freeState((XXH3_state_t*)mState);
|
||||
mState = NULL;
|
||||
}
|
||||
|
||||
const LLUUID& HBXXH128::digest() const
|
||||
{
|
||||
if (mState)
|
||||
{
|
||||
XXH128_hash_t hash = XXH3_128bits_digest((XXH3_state_t*)mState);
|
||||
// We cheat the const-ness of the method here, but this is OK, since
|
||||
// mDigest is private and cannot be accessed indirectly by other
|
||||
// methods than digest() ones, that do check for mState to decide
|
||||
// wether mDigest's current value may be provided as is or not. This
|
||||
// cheat saves us a temporary LLLUID copy.
|
||||
U64* data = (U64*)mDigest.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
}
|
||||
return mDigest;
|
||||
}
|
||||
|
||||
void HBXXH128::digest(LLUUID& result) const
|
||||
{
|
||||
if (!mState)
|
||||
{
|
||||
result = mDigest;
|
||||
return;
|
||||
}
|
||||
XXH128_hash_t hash = XXH3_128bits_digest((XXH3_state_t*)mState);
|
||||
U64* data = (U64*)result.mData;
|
||||
// Note: we do not check endianness here and we just store in the same
|
||||
// order as XXH128_hash_t, that is low word "first".
|
||||
data[0] = hash.low64;
|
||||
data[1] = hash.high64;
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& stream, HBXXH128 context)
|
||||
{
|
||||
stream << context.digest();
|
||||
return stream;
|
||||
}
|
||||
|
|
@ -0,0 +1,259 @@
|
|||
/**
|
||||
* @file hbxxh.h
|
||||
* @brief High performances vectorized hashing based on xxHash.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (c) 2023, Henri Beauchamp.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_HBXXH_H
|
||||
#define LL_HBXXH_H
|
||||
|
||||
#include "lluuid.h"
|
||||
|
||||
// HBXXH* classes are to be used where speed matters and cryptographic quality
|
||||
// is not required (no "one-way" guarantee, though they are likely not worst in
|
||||
// this respect than MD5 which got busted and is now considered too weak). The
|
||||
// xxHash code they are built upon is vectorized and about 50 times faster than
|
||||
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
|
||||
// not needed. The hashes collision rate is similar to MD5's.
|
||||
// See https://github.com/Cyan4973/xxHash#readme for details.
|
||||
|
||||
// 64 bits hashing class
|
||||
|
||||
class HBXXH64
|
||||
{
|
||||
friend std::ostream& operator<<(std::ostream&, HBXXH64);
|
||||
|
||||
protected:
|
||||
LOG_CLASS(HBXXH64);
|
||||
|
||||
public:
|
||||
inline HBXXH64() { init(); }
|
||||
|
||||
// Constructors for special circumstances; they all digest the first passed
|
||||
// parameter. Set 'do_finalize' to false if you do not want to finalize the
|
||||
// context, which is useful/needed when you want to update() it afterwards.
|
||||
// Ideally, the compiler should be smart enough to get our clue and
|
||||
// optimize out the const bool test during inlining...
|
||||
|
||||
inline HBXXH64(const void* buffer, size_t len,
|
||||
const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(buffer, len);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH64(const std::string& str, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(str);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH64(std::istream& s, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(s);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH64(FILE* file, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(file);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
~HBXXH64();
|
||||
|
||||
void update(const void* buffer, size_t len);
|
||||
void update(const std::string& str);
|
||||
void update(std::istream& s);
|
||||
void update(FILE* file);
|
||||
|
||||
// Note that unlike what happens with LLMD5, you do not need to finalize()
|
||||
// HBXXH64 before using digest(), and you may keep updating() it even after
|
||||
// you got a first digest() (the next digest would of course change after
|
||||
// any update). It is still useful to use finalize() when you do not want
|
||||
// to store a final digest() result in a separate U64; after this method
|
||||
// has been called, digest() simply returns mDigest value.
|
||||
void finalize();
|
||||
|
||||
U64 digest() const;
|
||||
|
||||
// Fast static methods. Use them when hashing just one contiguous block of
|
||||
// data.
|
||||
static U64 digest(const void* buffer, size_t len);
|
||||
static U64 digest(const char* str); // str must be NUL-terminated
|
||||
static U64 digest(const std::string& str);
|
||||
|
||||
private:
|
||||
void init();
|
||||
|
||||
private:
|
||||
// We use a void pointer to avoid including xxhash.h here for XXH3_state_t
|
||||
// (which cannot either be trivially forward-declared, due to complex API
|
||||
// related pre-processor macros in xxhash.h).
|
||||
void* mState;
|
||||
U64 mDigest;
|
||||
};
|
||||
|
||||
inline bool operator==(const HBXXH64& a, const HBXXH64& b)
|
||||
{
|
||||
return a.digest() == b.digest();
|
||||
}
|
||||
|
||||
inline bool operator!=(const HBXXH64& a, const HBXXH64& b)
|
||||
{
|
||||
return a.digest() != b.digest();
|
||||
}
|
||||
|
||||
// 128 bits hashing class
|
||||
|
||||
class HBXXH128
|
||||
{
|
||||
friend std::ostream& operator<<(std::ostream&, HBXXH128);
|
||||
|
||||
protected:
|
||||
LOG_CLASS(HBXXH128);
|
||||
|
||||
public:
|
||||
inline HBXXH128() { init(); }
|
||||
|
||||
// Constructors for special circumstances; they all digest the first passed
|
||||
// parameter. Set 'do_finalize' to false if you do not want to finalize the
|
||||
// context, which is useful/needed when you want to update() it afterwards.
|
||||
// Ideally, the compiler should be smart enough to get our clue and
|
||||
// optimize out the const bool test during inlining...
|
||||
|
||||
inline HBXXH128(const void* buffer, size_t len,
|
||||
const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(buffer, len);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH128(const std::string& str, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(str);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH128(std::istream& s, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(s);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
inline HBXXH128(FILE* file, const bool do_finalize = true)
|
||||
{
|
||||
init();
|
||||
update(file);
|
||||
if (do_finalize)
|
||||
{
|
||||
finalize();
|
||||
}
|
||||
}
|
||||
|
||||
~HBXXH128();
|
||||
|
||||
void update(const void* buffer, size_t len);
|
||||
void update(const std::string& str);
|
||||
void update(std::istream& s);
|
||||
void update(FILE* file);
|
||||
|
||||
// Note that unlike what happens with LLMD5, you do not need to finalize()
|
||||
// HBXXH128 before using digest(), and you may keep updating() it even
|
||||
// after you got a first digest() (the next digest would of course change
|
||||
// after any update). It is still useful to use finalize() when you do not
|
||||
// want to store a final digest() result in a separate LLUUID; after this
|
||||
// method has been called, digest() simply returns a reference on mDigest.
|
||||
void finalize();
|
||||
|
||||
// We use an LLUUID for the digest, since this is a 128 bits wide native
|
||||
// type available in the viewer code, making it easy to manipulate. It also
|
||||
// allows to use HBXXH128 efficiently in LLUUID generate() and combine()
|
||||
// methods.
|
||||
const LLUUID& digest() const;
|
||||
|
||||
// Here, we avoid an LLUUID copy whenever we already got one to store the
|
||||
// result *and* we did not yet call finalize().
|
||||
void digest(LLUUID& result) const;
|
||||
|
||||
// Fast static methods. Use them when hashing just one contiguous block of
|
||||
// data.
|
||||
static LLUUID digest(const void* buffer, size_t len);
|
||||
static LLUUID digest(const char* str); // str must be NUL-terminated
|
||||
static LLUUID digest(const std::string& str);
|
||||
// Same as above, but saves you from an LLUUID copy when you already got
|
||||
// one for storage use.
|
||||
static void digest(LLUUID& result, const void* buffer, size_t len);
|
||||
static void digest(LLUUID& result, const char* str); // str NUL-terminated
|
||||
static void digest(LLUUID& result, const std::string& str);
|
||||
|
||||
private:
|
||||
void init();
|
||||
|
||||
private:
|
||||
// We use a void pointer to avoid including xxhash.h here for XXH3_state_t
|
||||
// (which cannot either be trivially forward-declared, due to complex API
|
||||
// related pre-processor macros in xxhash.h).
|
||||
void* mState;
|
||||
LLUUID mDigest;
|
||||
};
|
||||
|
||||
inline bool operator==(const HBXXH128& a, const HBXXH128& b)
|
||||
{
|
||||
return a.digest() == b.digest();
|
||||
}
|
||||
|
||||
inline bool operator!=(const HBXXH128& a, const HBXXH128& b)
|
||||
{
|
||||
return a.digest() != b.digest();
|
||||
}
|
||||
|
||||
#endif // LL_HBXXH_H
|
||||
|
|
@ -40,11 +40,12 @@
|
|||
#include "lluuid.h"
|
||||
#include "llerror.h"
|
||||
#include "llrand.h"
|
||||
#include "llmd5.h"
|
||||
#include "llstring.h"
|
||||
#include "lltimer.h"
|
||||
#include "llthread.h"
|
||||
#include "llmutex.h"
|
||||
#include "hbxxh.h"
|
||||
|
||||
#include "llprofiler.h"
|
||||
const LLUUID LLUUID::null;
|
||||
const LLTransactionID LLTransactionID::tnull;
|
||||
|
|
@ -405,11 +406,9 @@ LLUUID LLUUID::operator^(const LLUUID& rhs) const
|
|||
|
||||
void LLUUID::combine(const LLUUID& other, LLUUID& result) const
|
||||
{
|
||||
LLMD5 md5_uuid;
|
||||
md5_uuid.update((unsigned char*)mData, 16);
|
||||
md5_uuid.update((unsigned char*)other.mData, 16);
|
||||
md5_uuid.finalize();
|
||||
md5_uuid.raw_digest(result.mData);
|
||||
HBXXH128 hash((const void*)mData, 16, false); // false = do not finalize
|
||||
hash.update((const void*)other.mData, 16);
|
||||
hash.digest(result);
|
||||
}
|
||||
|
||||
LLUUID LLUUID::combine(const LLUUID &other) const
|
||||
|
|
@ -860,17 +859,12 @@ void LLUUID::generate()
|
|||
tmp >>= 8;
|
||||
mData[8] = (unsigned char) tmp;
|
||||
|
||||
LLMD5 md5_uuid;
|
||||
|
||||
md5_uuid.update(mData,16);
|
||||
md5_uuid.finalize();
|
||||
md5_uuid.raw_digest(mData);
|
||||
HBXXH128::digest(*this, (const void*)mData, 16);
|
||||
}
|
||||
|
||||
void LLUUID::generate(const std::string& hash_string)
|
||||
{
|
||||
LLMD5 md5_uuid((U8*)hash_string.c_str());
|
||||
md5_uuid.raw_digest(mData);
|
||||
HBXXH128::digest(*this, hash_string);
|
||||
}
|
||||
|
||||
U32 LLUUID::getRandomSeed()
|
||||
|
|
@ -888,13 +882,8 @@ U32 LLUUID::getRandomSeed()
|
|||
seed[7]=(unsigned char)(pid);
|
||||
getSystemTime((uuid_time_t *)(&seed[8]));
|
||||
|
||||
LLMD5 md5_seed;
|
||||
|
||||
md5_seed.update(seed,16);
|
||||
md5_seed.finalize();
|
||||
md5_seed.raw_digest(seed);
|
||||
|
||||
return(*(U32 *)seed);
|
||||
U64 seed64 = HBXXH64((const void*)seed, 16).digest();
|
||||
return U32(seed64) ^ U32(seed64 >> 32);
|
||||
}
|
||||
|
||||
BOOL LLUUID::parseUUID(const std::string& buf, LLUUID* value)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "llconvexdecomposition.h"
|
||||
#include "llsdserialize.h"
|
||||
#include "llvector4a.h"
|
||||
#include "llmd5.h"
|
||||
#include "hbxxh.h"
|
||||
#include "llcontrol.h"
|
||||
|
||||
#ifdef LL_USESYSTEMLIBS
|
||||
|
|
@ -1570,7 +1570,7 @@ LLSD LLMeshSkinInfo::asLLSD(bool include_joints, bool lock_scale_if_joint_positi
|
|||
void LLMeshSkinInfo::updateHash()
|
||||
{
|
||||
// get hash of data relevant to render batches
|
||||
LLMD5 hash;
|
||||
HBXXH64 hash;
|
||||
|
||||
//mJointNames
|
||||
for (auto& name : mJointNames)
|
||||
|
|
@ -1581,24 +1581,19 @@ void LLMeshSkinInfo::updateHash()
|
|||
}
|
||||
|
||||
//mJointNums
|
||||
hash.update((U8*)&(mJointNums[0]), sizeof(S32) * mJointNums.size());
|
||||
hash.update((const void*)mJointNums.data(), sizeof(S32) * mJointNums.size());
|
||||
|
||||
//mInvBindMatrix
|
||||
F32* src = mInvBindMatrix[0].getF32ptr();
|
||||
|
||||
for (int i = 0; i < mInvBindMatrix.size() * 16; ++i)
|
||||
for (size_t i = 0, count = mInvBindMatrix.size() * 16; i < count; ++i)
|
||||
{
|
||||
S32 t = llround(src[i] * 10000.f);
|
||||
hash.update((U8*)&t, sizeof(S32));
|
||||
hash.update((const void*)&t, sizeof(S32));
|
||||
}
|
||||
//hash.update((U8*)&(mInvBindMatrix[0]), sizeof(LLMatrix4a) * mInvBindMatrix.size());
|
||||
//hash.update((const void*)mInvBindMatrix.data(), sizeof(LLMatrix4a) * mInvBindMatrix.size());
|
||||
|
||||
hash.finalize();
|
||||
|
||||
U64 digest[2];
|
||||
hash.raw_digest((U8*) digest);
|
||||
|
||||
mHash = digest[0];
|
||||
mHash = hash.digest();
|
||||
}
|
||||
|
||||
U32 LLMeshSkinInfo::sizeBytes() const
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
*/
|
||||
|
||||
#include "llmodelloader.h"
|
||||
|
||||
#include "llapp.h"
|
||||
#include "llsdserialize.h"
|
||||
#include "lljoint.h"
|
||||
#include "llcallbacklist.h"
|
||||
|
|
@ -381,7 +383,10 @@ bool LLModelLoader::isAlive(LLModelLoader* loader)
|
|||
|
||||
void LLModelLoader::loadModelCallback()
|
||||
{
|
||||
mLoadCallback(mScene,mModelList,mLod, mOpaqueData);
|
||||
if (!LLApp::isExiting())
|
||||
{
|
||||
mLoadCallback(mScene, mModelList, mLod, mOpaqueData);
|
||||
}
|
||||
|
||||
while (!isStopped())
|
||||
{ //wait until this thread is stopped before deleting self
|
||||
|
|
|
|||
|
|
@ -311,6 +311,15 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking)
|
|||
return success;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getOpenFileModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata)
|
||||
{
|
||||
// not supposed to be used yet, use LLFilePickerThread
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
|
||||
{
|
||||
if( mLocked )
|
||||
|
|
@ -388,6 +397,15 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
|
|||
return success;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata )
|
||||
{
|
||||
// not supposed to be used yet, use LLFilePickerThread
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename, bool blocking)
|
||||
{
|
||||
if( mLocked )
|
||||
|
|
@ -641,6 +659,16 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
|
|||
return success;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata)
|
||||
{
|
||||
// not supposed to be used yet, use LLFilePickerThread
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#elif LL_DARWIN
|
||||
|
||||
std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode)
|
||||
|
|
@ -747,129 +775,150 @@ bool LLFilePicker::doNavChooseDialog(ELoadFilter filter)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool LLFilePicker::doNavChooseDialogModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &,void*),
|
||||
void *userdata)
|
||||
{
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
if ( check_local_file_access_enabled() == false )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
std::vector<std::string> *allowed_types=navOpenFilterProc(filter);
|
||||
|
||||
doLoadDialogModeless(allowed_types,
|
||||
mPickOptions,
|
||||
callback,
|
||||
userdata);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension, std::string &type, std::string &creator)
|
||||
{
|
||||
switch (filter)
|
||||
{
|
||||
case LLFilePicker::FFSAVE_WAV:
|
||||
type = "WAVE";
|
||||
creator = "TVOD";
|
||||
extension = "wav";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_TGA:
|
||||
type = "TPIC";
|
||||
creator = "prvw";
|
||||
extension = "tga";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_TGAPNG:
|
||||
type = "PNG";
|
||||
creator = "prvw";
|
||||
extension = "png,tga";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_BMP:
|
||||
type = "BMPf";
|
||||
creator = "prvw";
|
||||
extension = "bmp";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_JPEG:
|
||||
type = "JPEG";
|
||||
creator = "prvw";
|
||||
extension = "jpeg";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_PNG:
|
||||
type = "PNG ";
|
||||
creator = "prvw";
|
||||
extension = "png";
|
||||
break;
|
||||
case LLFilePicker::FFSAVE_AVI:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "mov";
|
||||
break;
|
||||
|
||||
case LLFilePicker::FFSAVE_ANIM:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "xaf";
|
||||
break;
|
||||
|
||||
#ifdef _CORY_TESTING
|
||||
case LLFilePicker::FFSAVE_GEOMETRY:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "slg";
|
||||
break;
|
||||
#endif
|
||||
|
||||
// <FS:TS> Compile fix
|
||||
//case LLFilePicker::FFSAVE_XML:
|
||||
// type = "\?\?\?\?";
|
||||
// creator = "\?\?\?\?";
|
||||
// extension = "xml";
|
||||
// break;
|
||||
// </FS:TS> Compile fix
|
||||
|
||||
case LLFilePicker::FFSAVE_RAW:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "raw";
|
||||
break;
|
||||
|
||||
case LLFilePicker::FFSAVE_J2C:
|
||||
type = "\?\?\?\?";
|
||||
creator = "prvw";
|
||||
extension = "j2c";
|
||||
break;
|
||||
|
||||
case LLFilePicker::FFSAVE_SCRIPT:
|
||||
type = "LSL ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "lsl";
|
||||
break;
|
||||
|
||||
// <FS:CR> Export filter
|
||||
case FFSAVE_EXPORT:
|
||||
type = "OXP ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "oxp";
|
||||
break;
|
||||
case FFSAVE_COLLADA:
|
||||
type = "DAE ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "dae";
|
||||
break;
|
||||
// <FS:CR> CSV Filter
|
||||
case FFSAVE_CSV:
|
||||
type = "CSV ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "csv";
|
||||
break;
|
||||
// </FS:CR>
|
||||
case FFSAVE_BEAM:
|
||||
case FFSAVE_XML:
|
||||
type = "XML ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "xml";
|
||||
break;
|
||||
|
||||
case LLFilePicker::FFSAVE_ALL:
|
||||
default:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filename)
|
||||
{
|
||||
|
||||
// Setup the type, creator, and extension
|
||||
std::string extension, type, creator;
|
||||
|
||||
switch (filter)
|
||||
{
|
||||
case FFSAVE_WAV:
|
||||
type = "WAVE";
|
||||
creator = "TVOD";
|
||||
extension = "wav";
|
||||
break;
|
||||
case FFSAVE_TGA:
|
||||
type = "TPIC";
|
||||
creator = "prvw";
|
||||
extension = "tga";
|
||||
break;
|
||||
case FFSAVE_TGAPNG:
|
||||
type = "PNG";
|
||||
creator = "prvw";
|
||||
extension = "png,tga";
|
||||
break;
|
||||
case FFSAVE_BMP:
|
||||
type = "BMPf";
|
||||
creator = "prvw";
|
||||
extension = "bmp";
|
||||
break;
|
||||
case FFSAVE_JPEG:
|
||||
type = "JPEG";
|
||||
creator = "prvw";
|
||||
extension = "jpeg";
|
||||
break;
|
||||
case FFSAVE_PNG:
|
||||
type = "PNG ";
|
||||
creator = "prvw";
|
||||
extension = "png";
|
||||
break;
|
||||
case FFSAVE_AVI:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "mov";
|
||||
break;
|
||||
|
||||
case FFSAVE_ANIM:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "xaf";
|
||||
break;
|
||||
|
||||
#ifdef _CORY_TESTING
|
||||
case FFSAVE_GEOMETRY:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "slg";
|
||||
break;
|
||||
#endif
|
||||
// <FS:TS> Compile fix
|
||||
// case FFSAVE_XML:
|
||||
// type = "\?\?\?\?";
|
||||
// creator = "\?\?\?\?";
|
||||
// extension = "xml";
|
||||
// break;
|
||||
// </FS:TS> Compile fix
|
||||
|
||||
case FFSAVE_RAW:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "raw";
|
||||
break;
|
||||
|
||||
case FFSAVE_J2C:
|
||||
type = "\?\?\?\?";
|
||||
creator = "prvw";
|
||||
extension = "j2c";
|
||||
break;
|
||||
|
||||
case FFSAVE_SCRIPT:
|
||||
type = "LSL ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "lsl";
|
||||
break;
|
||||
// <FS:CR> Export filter
|
||||
case FFSAVE_EXPORT:
|
||||
type = "OXP ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "oxp";
|
||||
break;
|
||||
case FFSAVE_COLLADA:
|
||||
type = "DAE ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "dae";
|
||||
break;
|
||||
// <FS:CR> CSV Filter
|
||||
case FFSAVE_CSV:
|
||||
type = "CSV ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "csv";
|
||||
break;
|
||||
// </FS:CR>
|
||||
case FFSAVE_BEAM:
|
||||
case FFSAVE_XML:
|
||||
type = "XML ";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "xml";
|
||||
break;
|
||||
case FFSAVE_ALL:
|
||||
default:
|
||||
type = "\?\?\?\?";
|
||||
creator = "\?\?\?\?";
|
||||
extension = "";
|
||||
break;
|
||||
}
|
||||
set_nav_save_data(filter, extension, type, creator);
|
||||
|
||||
std::string namestring = filename;
|
||||
if (namestring.empty()) namestring="Untitled";
|
||||
|
||||
// if (! boost::algorithm::ends_with(namestring, extension) )
|
||||
// {
|
||||
// namestring = namestring + "." + extension;
|
||||
//
|
||||
// }
|
||||
|
||||
gViewerWindow->getWindow()->beforeDialog();
|
||||
|
||||
// Run the dialog
|
||||
|
|
@ -890,6 +939,30 @@ bool LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filena
|
|||
return false;
|
||||
}
|
||||
|
||||
bool LLFilePicker::doNavSaveDialogModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata)
|
||||
{
|
||||
// Setup the type, creator, and extension
|
||||
std::string extension, type, creator;
|
||||
|
||||
set_nav_save_data(filter, extension, type, creator);
|
||||
|
||||
std::string namestring = filename;
|
||||
if (namestring.empty()) namestring="Untitled";
|
||||
|
||||
// Run the dialog
|
||||
doSaveDialogModeless(&namestring,
|
||||
&type,
|
||||
&creator,
|
||||
&extension,
|
||||
mPickOptions,
|
||||
callback,
|
||||
userdata);
|
||||
return true;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking)
|
||||
{
|
||||
if( mLocked )
|
||||
|
|
@ -945,18 +1018,52 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking)
|
|||
return success;
|
||||
}
|
||||
|
||||
|
||||
BOOL LLFilePicker::getOpenFileModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata)
|
||||
{
|
||||
if( mLocked )
|
||||
return FALSE;
|
||||
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
if ( check_local_file_access_enabled() == false )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
reset();
|
||||
|
||||
mPickOptions &= ~F_MULTIPLE;
|
||||
mPickOptions |= F_FILE;
|
||||
|
||||
if (filter == FFLOAD_DIRECTORY) //This should only be called from lldirpicker.
|
||||
{
|
||||
|
||||
mPickOptions |= ( F_NAV_SUPPORT | F_DIRECTORY );
|
||||
mPickOptions &= ~F_FILE;
|
||||
}
|
||||
|
||||
if (filter == FFLOAD_ALL) // allow application bundles etc. to be traversed; important for DEV-16869, but generally useful
|
||||
{
|
||||
mPickOptions |= F_NAV_SUPPORT;
|
||||
}
|
||||
|
||||
return doNavChooseDialogModeless(filter, callback, userdata);
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
|
||||
{
|
||||
if( mLocked )
|
||||
return FALSE;
|
||||
|
||||
BOOL success = FALSE;
|
||||
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
if ( check_local_file_access_enabled() == false )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL success = FALSE;
|
||||
|
||||
reset();
|
||||
|
||||
|
|
@ -990,6 +1097,29 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
|
|||
return success;
|
||||
}
|
||||
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata )
|
||||
{
|
||||
if( mLocked )
|
||||
return FALSE;
|
||||
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
if ( check_local_file_access_enabled() == false )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
reset();
|
||||
|
||||
mPickOptions |= F_FILE;
|
||||
|
||||
mPickOptions |= F_MULTIPLE;
|
||||
|
||||
return doNavChooseDialogModeless(filter, callback, userdata);
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename, bool blocking)
|
||||
{
|
||||
|
||||
|
|
@ -1030,6 +1160,27 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
|
|||
LLFrameTimer::updateFrameTime();
|
||||
return success;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata)
|
||||
{
|
||||
if( mLocked )
|
||||
return false;
|
||||
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
if ( check_local_file_access_enabled() == false )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
reset();
|
||||
|
||||
mPickOptions &= ~F_MULTIPLE;
|
||||
|
||||
return doNavSaveDialogModeless(filter, filename, callback, userdata);
|
||||
}
|
||||
//END LL_DARWIN
|
||||
|
||||
#elif LL_LINUX
|
||||
|
|
@ -1829,6 +1980,15 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata)
|
||||
{
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking )
|
||||
{
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
|
|
@ -1854,6 +2014,14 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking )
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getOpenFileModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata)
|
||||
{
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter, bool blocking)
|
||||
{
|
||||
// if local file browsing is turned off, return without opening dialog
|
||||
|
|
@ -1867,6 +2035,14 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter, bool blocking)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata )
|
||||
{
|
||||
LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif // LL_GTK
|
||||
|
||||
#else // not implemented
|
||||
|
|
|
|||
|
|
@ -129,8 +129,16 @@ public:
|
|||
|
||||
// open the dialog. This is a modal operation
|
||||
BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const std::string& filename = LLStringUtil::null, bool blocking = true);
|
||||
BOOL getSaveFileModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata);
|
||||
BOOL getOpenFile( ELoadFilter filter = FFLOAD_ALL, bool blocking = true );
|
||||
// Todo: implement getOpenFileModeless and getMultipleOpenFilesModeless
|
||||
// for windows and use directly instead of ugly LLFilePickerThread
|
||||
BOOL getOpenFileModeless( ELoadFilter filter, void (*callback)(bool, std::vector<std::string> &, void*), void *userdata); // MAC only.
|
||||
BOOL getMultipleOpenFiles( ELoadFilter filter = FFLOAD_ALL, bool blocking = true );
|
||||
BOOL getMultipleOpenFilesModeless( ELoadFilter filter, void (*callback)(bool, std::vector<std::string> &, void*), void *userdata ); // MAC only
|
||||
|
||||
// Get the filename(s) found. getFirstFile() sets the pointer to
|
||||
// the start of the structure and allows the start of iteration.
|
||||
|
|
@ -181,8 +189,15 @@ private:
|
|||
std::vector<std::string> mFileVector;
|
||||
|
||||
bool doNavChooseDialog(ELoadFilter filter);
|
||||
bool doNavChooseDialogModeless(ELoadFilter filter,
|
||||
void (*callback)(bool, std::vector<std::string>&, void*),
|
||||
void *userdata);
|
||||
bool doNavSaveDialog(ESaveFilter filter, const std::string& filename);
|
||||
std::vector<std::string>* navOpenFilterProc(ELoadFilter filter);
|
||||
bool doNavSaveDialogModeless(ESaveFilter filter,
|
||||
const std::string& filename,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata);
|
||||
#endif
|
||||
|
||||
#if LL_GTK
|
||||
|
|
|
|||
|
|
@ -41,11 +41,25 @@
|
|||
//void modelessPicker();
|
||||
std::vector<std::string>* doLoadDialog(const std::vector<std::string>* allowed_types,
|
||||
unsigned int flags);
|
||||
|
||||
void doLoadDialogModeless(const std::vector<std::string>* allowed_types,
|
||||
unsigned int flags,
|
||||
void (*callback)(bool, std::vector<std::string>&, void*),
|
||||
void *userdata);
|
||||
|
||||
std::string* doSaveDialog(const std::string* file,
|
||||
const std::string* type,
|
||||
const std::string* creator,
|
||||
const std::string* extension,
|
||||
unsigned int flags);
|
||||
|
||||
void doSaveDialogModeless(const std::string* file,
|
||||
const std::string* type,
|
||||
const std::string* creator,
|
||||
const std::string* extension,
|
||||
unsigned int flags,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata);
|
||||
enum {
|
||||
F_FILE = 0x00000001,
|
||||
F_DIRECTORY = 0x00000002,
|
||||
|
|
|
|||
|
|
@ -29,28 +29,23 @@
|
|||
#include <iostream>
|
||||
#include "llfilepicker_mac.h"
|
||||
|
||||
std::vector<std::string>* doLoadDialog(const std::vector<std::string>* allowed_types,
|
||||
unsigned int flags)
|
||||
NSOpenPanel *init_panel(const std::vector<std::string>* allowed_types, unsigned int flags)
|
||||
{
|
||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; // <FS> Fix mem leak by Cinder Roxley
|
||||
int i, result;
|
||||
|
||||
//Aura TODO: We could init a small window and release it at the end of this routine
|
||||
//for a modeless interface.
|
||||
int i;
|
||||
|
||||
NSOpenPanel *panel = [NSOpenPanel openPanel];
|
||||
//NSString *fileName = nil;
|
||||
NSMutableArray *fileTypes = nil;
|
||||
|
||||
|
||||
if ( allowed_types && !allowed_types->empty())
|
||||
if ( allowed_types && !allowed_types->empty())
|
||||
{
|
||||
fileTypes = [[NSMutableArray alloc] init];
|
||||
|
||||
for (i=0;i<allowed_types->size();++i)
|
||||
{
|
||||
[fileTypes addObject:
|
||||
[NSString stringWithCString:(*allowed_types)[i].c_str()
|
||||
[fileTypes addObject:
|
||||
[NSString stringWithCString:(*allowed_types)[i].c_str()
|
||||
encoding:[NSString defaultCStringEncoding]]];
|
||||
}
|
||||
}
|
||||
|
|
@ -63,21 +58,30 @@ std::vector<std::string>* doLoadDialog(const std::vector<std::string>* allowed_t
|
|||
[panel setCanChooseFiles: ( (flags & F_FILE)?true:false )];
|
||||
[panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
|
||||
|
||||
std::vector<std::string>* outfiles = NULL;
|
||||
|
||||
if (fileTypes)
|
||||
{
|
||||
[panel setAllowedFileTypes:fileTypes];
|
||||
result = [panel runModal];
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
// I suggest it's better to open the last path and let this default to home dir as necessary
|
||||
// for consistency with other OS X apps
|
||||
//
|
||||
//[panel setDirectoryURL: fileURLWithPath(NSHomeDirectory()) ];
|
||||
result = [panel runModal];
|
||||
}
|
||||
return panel;
|
||||
}
|
||||
|
||||
std::vector<std::string>* doLoadDialog(const std::vector<std::string>* allowed_types,
|
||||
unsigned int flags)
|
||||
{
|
||||
int result;
|
||||
|
||||
NSOpenPanel *panel = init_panel(allowed_types,flags);
|
||||
|
||||
result = [panel runModal];
|
||||
|
||||
std::vector<std::string>* outfiles = NULL;
|
||||
|
||||
if (result == NSOKButton)
|
||||
{
|
||||
|
|
@ -100,6 +104,44 @@ std::vector<std::string>* doLoadDialog(const std::vector<std::string>* allowed_t
|
|||
return outfiles;
|
||||
}
|
||||
|
||||
void doLoadDialogModeless(const std::vector<std::string>* allowed_types,
|
||||
unsigned int flags,
|
||||
void (*callback)(bool, std::vector<std::string> &, void*),
|
||||
void *userdata)
|
||||
{
|
||||
// Note: might need to return and save this panel
|
||||
// so that it does not close immediately
|
||||
NSOpenPanel *panel = init_panel(allowed_types,flags);
|
||||
|
||||
[panel beginWithCompletionHandler:^(NSModalResponse result)
|
||||
{
|
||||
std::vector<std::string> outfiles;
|
||||
if (result == NSOKButton)
|
||||
{
|
||||
NSArray *filesToOpen = [panel URLs];
|
||||
int i, count = [filesToOpen count];
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
|
||||
for (i=0; i<count; i++) {
|
||||
NSString *aFile = [[filesToOpen objectAtIndex:i] path];
|
||||
std::string *afilestr = new std::string([aFile UTF8String]);
|
||||
outfiles.push_back(*afilestr);
|
||||
}
|
||||
callback(true, outfiles, userdata);
|
||||
}
|
||||
else // no valid result
|
||||
{
|
||||
callback(false, outfiles, userdata);
|
||||
}
|
||||
}
|
||||
else // cancel
|
||||
{
|
||||
callback(false, outfiles, userdata);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
std::string* doSaveDialog(const std::string* file,
|
||||
const std::string* type,
|
||||
|
|
@ -137,4 +179,46 @@ std::string* doSaveDialog(const std::string* file,
|
|||
return outfile;
|
||||
}
|
||||
|
||||
void doSaveDialogModeless(const std::string* file,
|
||||
const std::string* type,
|
||||
const std::string* creator,
|
||||
const std::string* extension,
|
||||
unsigned int flags,
|
||||
void (*callback)(bool, std::string&, void*),
|
||||
void *userdata)
|
||||
{
|
||||
NSSavePanel *panel = [NSSavePanel savePanel];
|
||||
|
||||
NSString *extensionns = [NSString stringWithCString:extension->c_str() encoding:[NSString defaultCStringEncoding]];
|
||||
NSArray *fileType = [extensionns componentsSeparatedByString:@","];
|
||||
|
||||
//[panel setMessage:@"Save Image File"];
|
||||
[panel setTreatsFilePackagesAsDirectories: ( flags & F_NAV_SUPPORT ) ];
|
||||
[panel setCanSelectHiddenExtension:true];
|
||||
[panel setAllowedFileTypes:fileType];
|
||||
NSString *fileName = [NSString stringWithCString:file->c_str() encoding:[NSString defaultCStringEncoding]];
|
||||
|
||||
NSURL* url = [NSURL fileURLWithPath:fileName];
|
||||
[panel setNameFieldStringValue: fileName];
|
||||
[panel setDirectoryURL: url];
|
||||
|
||||
|
||||
[panel beginWithCompletionHandler:^(NSModalResponse result)
|
||||
{
|
||||
if (result == NSOKButton)
|
||||
{
|
||||
NSURL* url = [panel URL];
|
||||
NSString* p = [url path];
|
||||
std::string outfile([p UTF8String]);
|
||||
|
||||
callback(true, outfile, userdata);
|
||||
}
|
||||
else // cancel
|
||||
{
|
||||
std::string outfile;
|
||||
callback(false, outfile, userdata);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -131,7 +131,10 @@ std::queue<LLFilePickerThread*> LLFilePickerThread::sDeadQ;
|
|||
void LLFilePickerThread::getFile()
|
||||
{
|
||||
#if LL_WINDOWS
|
||||
// Todo: get rid of LLFilePickerThread and make this modeless
|
||||
start();
|
||||
#elif LL_DARWIN
|
||||
runModeless();
|
||||
#else
|
||||
run();
|
||||
#endif
|
||||
|
|
@ -174,7 +177,82 @@ void LLFilePickerThread::run()
|
|||
LLMutexLock lock(sMutex);
|
||||
sDeadQ.push(this);
|
||||
}
|
||||
}
|
||||
|
||||
void LLFilePickerThread::runModeless()
|
||||
{
|
||||
BOOL result = FALSE;
|
||||
LLFilePicker picker;
|
||||
|
||||
if (mIsSaveDialog)
|
||||
{
|
||||
result = picker.getSaveFileModeless(mSaveFilter,
|
||||
mProposedName,
|
||||
modelessStringCallback,
|
||||
this);
|
||||
}
|
||||
else if (mIsGetMultiple)
|
||||
{
|
||||
result = picker.getMultipleOpenFilesModeless(mLoadFilter, modelessVectorCallback, this);
|
||||
}
|
||||
else
|
||||
{
|
||||
result = picker.getOpenFileModeless(mLoadFilter, modelessVectorCallback, this);
|
||||
}
|
||||
|
||||
if (!result)
|
||||
{
|
||||
LLMutexLock lock(sMutex);
|
||||
sDeadQ.push(this);
|
||||
}
|
||||
}
|
||||
|
||||
void LLFilePickerThread::modelessStringCallback(bool success,
|
||||
std::string &response,
|
||||
void *user_data)
|
||||
{
|
||||
LLFilePickerThread *picker = (LLFilePickerThread*)user_data;
|
||||
if (success)
|
||||
{
|
||||
picker->mResponses.push_back(response);
|
||||
}
|
||||
|
||||
{
|
||||
LLMutexLock lock(sMutex);
|
||||
sDeadQ.push(picker);
|
||||
}
|
||||
}
|
||||
|
||||
void LLFilePickerThread::modelessVectorCallback(bool success,
|
||||
std::vector<std::string> &responses,
|
||||
void *user_data)
|
||||
{
|
||||
LLFilePickerThread *picker = (LLFilePickerThread*)user_data;
|
||||
if (success)
|
||||
{
|
||||
if (picker->mIsGetMultiple)
|
||||
{
|
||||
picker->mResponses = responses;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::vector<std::string>::iterator iter = responses.begin();
|
||||
while (iter != responses.end())
|
||||
{
|
||||
if (!iter->empty())
|
||||
{
|
||||
picker->mResponses.push_back(*iter);
|
||||
break;
|
||||
}
|
||||
iter++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
LLMutexLock lock(sMutex);
|
||||
sDeadQ.push(picker);
|
||||
}
|
||||
}
|
||||
|
||||
//static
|
||||
|
|
|
|||
|
|
@ -106,6 +106,9 @@ public:
|
|||
void getFile();
|
||||
|
||||
virtual void run();
|
||||
void runModeless();
|
||||
static void modelessStringCallback(bool success, std::string &response, void *user_data);
|
||||
static void modelessVectorCallback(bool success, std::vector<std::string> &responses, void *user_data);
|
||||
|
||||
virtual void notify(const std::vector<std::string>& filenames) = 0;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge.
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga.
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com).
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly und Mark Adler.
|
||||
|
||||
Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com.
|
||||
|
|
|
|||
|
|
@ -260,6 +260,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
|
||||
Some icons by Joseph Wain / glyphish.com
|
||||
|
||||
|
|
|
|||
|
|
@ -309,6 +309,17 @@
|
|||
media_plugin_cef
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="application/octet-stream">
|
||||
<label name="application/octet-stream_label">
|
||||
Stream
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="audio/mid">
|
||||
<label name="audio/mid_label">
|
||||
Audio (MIDI)
|
||||
|
|
@ -474,6 +485,17 @@
|
|||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="video/x-flv">
|
||||
<label name="video/x-flv_label">
|
||||
Movie (flv)
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="application/octet-stream">
|
||||
<label name="video/octet-stream">
|
||||
Movie
|
||||
|
|
|
|||
|
|
@ -287,6 +287,17 @@
|
|||
media_plugin_cef
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="application/octet-stream">
|
||||
<label name="application/octet-stream_label">
|
||||
Stream
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_gstreamer
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="audio/mid">
|
||||
<label name="audio/mid_label">
|
||||
Audio (MIDI)
|
||||
|
|
@ -452,6 +463,17 @@
|
|||
media_plugin_gstreamer
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="video/x-flv">
|
||||
<label name="video/x-flv_label">
|
||||
Movie (flv)
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_gstreamer
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype menu="1" name="video/quicktime">
|
||||
<label name="video/quicktime_label">
|
||||
Movie (QuickTime)
|
||||
|
|
|
|||
|
|
@ -287,6 +287,17 @@
|
|||
media_plugin_cef
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="application/octet-stream">
|
||||
<label name="application/octet-stream_label">
|
||||
Stream
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="audio/mid">
|
||||
<label name="audio/mid_label">
|
||||
Audio (MIDI)
|
||||
|
|
@ -452,6 +463,17 @@
|
|||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype name="video/x-flv">
|
||||
<label name="video/x-flv_label">
|
||||
Movie (flv)
|
||||
</label>
|
||||
<widgettype>
|
||||
movie
|
||||
</widgettype>
|
||||
<impl>
|
||||
media_plugin_libvlc
|
||||
</impl>
|
||||
</mimetype>
|
||||
<mimetype menu="1" name="video/quicktime">
|
||||
<label name="video/quicktime_label">
|
||||
Movie (QuickTime)
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly y Mark Adler.
|
||||
Algunos iconos por Joseph Wain / glyphish.com
|
||||
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
|
||||
|
||||
Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
|
||||
|
||||
Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
|
||||
|
||||
O Visualizador do Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e seus Licenciantes). Todos os direitos reservados. Consulte www.havok.com para obter detalhes.
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ PCRE Telif Hakkı (c) 1997-2012 University of Cambridge
|
|||
SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler.
|
||||
|
||||
Second Life Görüntüleyicisi Havok (TM) Fizik motorunu kullanmaktadır. (c)Telif Hakkı 1999-2010 Havok.com Inc. (ve Lisans Verenleri). Tüm Hakları Saklıdır. Ayrıntılı bilgi için bkz. www.havok.com
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
|
|||
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
|
||||
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
|
||||
xxHash Copyright (C) 2012-2020 Yann Collet.
|
||||
zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
|
||||
|
||||
第二人生 Viewer 採用 Havok (TM) 物理引擎。 (c)Copyright 1999-2010 Havok.com Inc.（及其放照人）。 保留一切權利。 詳情見 www.havok.com。
|
||||
|
|
|
|||
Loading…
Reference in New Issue