summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-x[-rw-r--r--]indra/cmake/Copy3rdPartyLibs.cmake0
-rw-r--r--[-rwxr-xr-x]indra/cmake/FMOD.cmake0
-rwxr-xr-x[-rw-r--r--]indra/cmake/LLPrimitive.cmake0
-rwxr-xr-x[-rw-r--r--]indra/cmake/LLTestCommand.cmake0
-rwxr-xr-x[-rw-r--r--]indra/cmake/Python.cmake0
-rw-r--r--[-rwxr-xr-x]indra/cmake/run_build_test.py0
-rwxr-xr-x[-rw-r--r--]indra/llcommon/llfasttimer.h0
-rwxr-xr-x[-rw-r--r--]indra/llprimitive/llmodel.cpp0
-rwxr-xr-x[-rw-r--r--]indra/llprimitive/llmodel.h0
-rwxr-xr-x[-rw-r--r--]indra/llvfs/lldir_win32.h0
-rwxr-xr-x[-rw-r--r--]indra/newview/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/settings.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/windows/installer_template.nsi0
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/windows/lang_en-us.nsibin7542 -> 7542 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/llagent.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llagentpilot.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llagentpilot.h0
-rwxr-xr-x[-rw-r--r--]indra/newview/llappviewer.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llfasttimerview.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llfloatermodelpreview.cpp2
-rwxr-xr-x[-rw-r--r--]indra/newview/llfloatermodelpreview.h0
-rwxr-xr-x[-rw-r--r--]indra/newview/llmeshrepository.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llstartup.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewermenu.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerstats.h0
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewertexture.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/pipeline.cpp0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/en/floater_model_preview.xml0
28 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 8e185df191..8e185df191 100644..100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index cb5124812d..cb5124812d 100755..100644
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index e68d16ed08..e68d16ed08 100644..100755
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake
index b5a0580a90..b5a0580a90 100644..100755
--- a/indra/cmake/LLTestCommand.cmake
+++ b/indra/cmake/LLTestCommand.cmake
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index 748c8c2bec..748c8c2bec 100644..100755
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 320a9be8ab..320a9be8ab 100755..100644
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 2b25f2fabb..2b25f2fabb 100644..100755
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 5af1122451..5af1122451 100644..100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 23f4b5cb42..23f4b5cb42 100644..100755
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h
index b170ebbcd7..b170ebbcd7 100644..100755
--- a/indra/llvfs/lldir_win32.h
+++ b/indra/llvfs/lldir_win32.h
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1d155add51..1d155add51 100644..100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6d80a21483..6d80a21483 100644..100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index b5d43021ec..b5d43021ec 100644..100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index da0d7f54d2..da0d7f54d2 100644..100755
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
Binary files differ
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 790f98e75d..790f98e75d 100644..100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 734c502fcf..734c502fcf 100644..100755
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
diff --git a/indra/newview/llagentpilot.h b/indra/newview/llagentpilot.h
index dd1709ec0c..dd1709ec0c 100644..100755
--- a/indra/newview/llagentpilot.h
+++ b/indra/newview/llagentpilot.h
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5dc803e287..5dc803e287 100644..100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 35712163eb..35712163eb 100644..100755
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index cdd2bcf8e3..c66b2255eb 100644..100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2164,7 +2164,7 @@ void LLModelLoader::loadTextures()
//-----------------------------------------------------------------------------
bool LLModelLoader::isNodeAJoint( domNode* pNode )
{
- if ( pNode->getName() == NULL)
+ if ( !pNode || pNode->getName() == NULL)
{
return false;
}
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 186bf114d1..186bf114d1 100644..100755
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index e20e918a2a..e20e918a2a 100644..100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 277d2430ce..277d2430ce 100644..100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1764db48a2..1764db48a2 100644..100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index f91a1241fe..f91a1241fe 100644..100755
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index af06421bf9..af06421bf9 100644..100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index a533be675c..a533be675c 100644..100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d08c3e7078..d08c3e7078 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml