diff options
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 2 | 
2 files changed, 3 insertions, 1 deletions
| diff --git a/doc/contributions.txt b/doc/contributions.txt index 68419ee40b..11f3ad6d3a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -61,6 +61,8 @@ Aimee Trescothick  Alejandro Rosenthal  	VWR-1184  Aleric Inglewood +	SNOW-522 +	SNOW-764  	VWR-10001  	VWR-10759  	VWR-10837 diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 6ccac45569..a1c6669b97 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -93,7 +93,7 @@ LLDir_Linux::LLDir_Linux()  #else  	mAppRODataDir = tmp_str;  #endif -    U32 indra_pos = mExecutableDir.find("/indra"); +    std::string::size_type indra_pos = mExecutableDir.find("/indra");      if (indra_pos != std::string::npos)      {  		// ...we're in a dev checkout | 
