diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 5 | ||||
| -rw-r--r-- | indra/llcommon/llstring.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsys.cpp | 23 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 |
4 files changed, 21 insertions, 11 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index f1094a8fd2..4109eade19 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -118,6 +118,7 @@ const char* const DEFAULT_AGNI_DATA_SERVER = "63.211.139.100"; const char* const DEFAULT_AGNI_ASSET_SERVER = "http://asset.agni.lindenlab.com:80"; // Information about what ports are for what services is in the wiki Name Space Ports page +// https://wiki.lindenlab.com/wiki/Name_Space_Ports const char* const DEFAULT_LOCAL_ASSET_SERVER = "http://localhost:12041/asset/tmp"; const char* const LOCAL_ASSET_URL_FORMAT = "http://%s:12041/asset"; @@ -138,6 +139,10 @@ const U32 DEFAULT_CAP_PROXY_PORT = 12043; const U32 DEFAULT_INV_DATA_SERVER_PORT = 12044; const U32 DEFAULT_CGI_SERVICES_PORT = 12045; +// Mapserver uses ports 12124 - 12139 to allow multiple mapservers to run +// on a single host for map tile generation. JC +const U32 DEFAULT_MAPSERVER_PORT = 12124; + // For automatic port discovery when running multiple viewers on one host const U32 PORT_DISCOVERY_RANGE_MIN = 13000; const U32 PORT_DISCOVERY_RANGE_MAX = PORT_DISCOVERY_RANGE_MIN + 50; diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 1a1dbd40b6..8915890e18 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -33,6 +33,8 @@ #ifndef LL_LLSTRING_H #define LL_LLSTRING_H +#include <string> + #if LL_LINUX || LL_SOLARIS #include <wctype.h> #include <wchar.h> diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index f68d86ff7c..2e93b2a3a7 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -300,19 +300,22 @@ U32 LLOSInfo::getProcessVirtualSizeKB() #endif #if LL_LINUX LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); - S32 numRead = 0; - char buff[STATUS_SIZE]; /* Flawfinder: ignore */ + if (status_filep) + { + S32 numRead = 0; + char buff[STATUS_SIZE]; /* Flawfinder: ignore */ - size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep); - buff[nbytes] = '\0'; + size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep); + buff[nbytes] = '\0'; - // All these guys return numbers in KB - char *memp = strstr(buff, "VmSize:"); - if (memp) - { - numRead += sscanf(memp, "%*s %u", &virtual_size); + // All these guys return numbers in KB + char *memp = strstr(buff, "VmSize:"); + if (memp) + { + numRead += sscanf(memp, "%*s %u", &virtual_size); + } + fclose(status_filep); } - fclose(status_filep); #elif LL_SOLARIS char proc_ps[LL_MAX_PATH]; sprintf(proc_ps, "/proc/%d/psinfo", (int)getpid()); diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 7593eeae37..f9b84dd6bd 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 27; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 109809; +const S32 LL_VERSION_BUILD = 112940; const char * const LL_CHANNEL = "Second Life Server"; |