diff --git a/.hgtags b/.hgtags index 99c20505eb8fa57e6092c25205ecc9236103743d..d48c328b8fabca3330f9f1aa892224679c9a4c57 100644 --- a/.hgtags +++ b/.hgtags @@ -307,3 +307,8 @@ a716684aa7c07c440b1de5815b8a1f3dd3fd8bfb DRTVWR-159 6414ecdabc5d89515b08d1f872cf923ed3a5523a DRTVWR-148 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c 3.3.3-beta1 +5910f8063a7e1ddddf504c2f35ca831cc5e8f469 DRTVWR-160 +1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c 3.3.3-beta1 +f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 3.3.3-beta1 +1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 +f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144 diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index b4899209c4156c15215e31c0a1a1ae83a0d6c4d6..823c6b9dc510d2019dff2307a5b11ae8de6edba2 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -38,7 +38,11 @@ #include "llglslshader.h" #include "llmemory.h" +#if LL_DARWIN +#define LL_VBO_POOLING 1 +#else #define LL_VBO_POOLING 0 +#endif //Next Highest Power Of Two //helper function, returns first number > v that is a power of 2, or v if v is already a power of 2