diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-17 09:41:29 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-17 10:26:06 +0800 |
| commit | 52784ad1722e515d9fe49ceddc9c5daf74656e77 (patch) | |
| tree | c2946c6a0b8513a249a93934208b542d779306e5 | |
| parent | 21aed6a877b2d82c3758704f403785be6809188d (diff) | |
Parts that were left out during 7.1.7 merge
Including a very important one which is so assets are fetched!
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 2 | ||||
| -rw-r--r-- | indra/llcorehttp/_httpoprequest.cpp | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 559deda96f..dee8e0d42b 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -970,7 +970,7 @@ private: LLPI_SET_INFO_INT(eModel, "model"); - S32 family; + S32 family = 0; if (!cpuinfo["cpu family"].empty() && LLStringUtil::convertToS32(cpuinfo["cpu family"], family)) { diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index 6b46f5c59c..c3d5ad5361 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -513,7 +513,7 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) check_curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1); check_curl_easy_setopt(mCurlHandle, CURLOPT_URL, mReqURL.c_str()); check_curl_easy_setopt(mCurlHandle, CURLOPT_PRIVATE, getHandle()); - check_curl_easy_setopt(mCurlHandle, CURLOPT_ENCODING, ""); + //check_curl_easy_setopt(mCurlHandle, CURLOPT_ENCODING, ""); check_curl_easy_setopt(mCurlHandle, CURLOPT_AUTOREFERER, 1); check_curl_easy_setopt(mCurlHandle, CURLOPT_MAXREDIRS, HTTP_REDIRECTS_DEFAULT); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 5c0be53673..086db4b33b 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -771,7 +771,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B if ( info.subsystem == SDL_SYSWM_X11 ) { mSDL_Display = info.info.x11.display; - mSDL_XWindowID = info.info.x11.wmwindow; + mSDL_XWindowID = info.info.x11.window; /* Lock_Display = info.info.x11.lock_func; Unlock_Display = info.info.x11.unlock_func; |