Merge develop into develop-linux

Merge pull request #5316 from RyeMutt/rye/devlinuxupdate

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/llcommon/llheteromap.cpp b/indra/llcommon/llheteromap.cpp
index 823bea7a3c..03dd7856b6 100644
--- a/indra/llcommon/llheteromap.cpp
+++ b/indra/llcommon/llheteromap.cpp
@@ -27,6 +27,6 @@ LLHeteroMap::~LLHeteroMap()
         // pair.second is the std::pair; pair.second.first is the void*;
         // pair.second.second points to the deleter function
         (pair.second.second)(pair.second.first);
-        pair.second.first = NULL;
+        pair.second.first = nullptr;
     }
 }