diff options
| author | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
| commit | 6599e10d00f3a47e90136f5f6cb4b2d1e02cb2e5 (patch) | |
| tree | d48c683923ee978db4dbb0d66cc0d9f45233a68e /indra/llcommon/llmemory.cpp | |
| parent | c16e726d0e2a8c607ce441eb5bf2419b16b41cab (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge with tip of viewer-release
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rwxr-xr-x | indra/llcommon/llmemory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index ae11988df8..3a8eabac09 100755 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -2176,8 +2176,7 @@ void* ll_aligned_malloc_fallback( size_t size, int align ) SYSTEM_INFO sysinfo; GetSystemInfo(&sysinfo); - unsigned int for_alloc = sysinfo.dwPageSize; - while(for_alloc < size) for_alloc += sysinfo.dwPageSize; + unsigned int for_alloc = (size/sysinfo.dwPageSize + !!(size%sysinfo.dwPageSize)) * sysinfo.dwPageSize; void *p = VirtualAlloc(NULL, for_alloc+sysinfo.dwPageSize, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE); if(NULL == p) { |