aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath/llquaternion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmath/llquaternion.cpp')
-rw-r--r--linden/indra/llmath/llquaternion.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp
index ab4855b..9eab8ed 100644
--- a/linden/indra/llmath/llquaternion.cpp
+++ b/linden/indra/llmath/llquaternion.cpp
@@ -791,7 +791,7 @@ LLQuaternion mayaQ(F32 xRot, F32 yRot, F32 zRot, LLQuaternion::Order order)
791 791
792const char *OrderToString( const LLQuaternion::Order order ) 792const char *OrderToString( const LLQuaternion::Order order )
793{ 793{
794 char *p = NULL; 794 const char *p = NULL;
795 switch( order ) 795 switch( order )
796 { 796 {
797 default: 797 default:
@@ -937,15 +937,15 @@ void LLQuaternion::unpackFromVector3( const LLVector3& vec )
937 } 937 }
938} 938}
939 939
940BOOL LLQuaternion::parseQuat(const char* buf, LLQuaternion* value) 940BOOL LLQuaternion::parseQuat(const std::string& buf, LLQuaternion* value)
941{ 941{
942 if( buf == NULL || buf[0] == '\0' || value == NULL) 942 if( buf.empty() || value == NULL)
943 { 943 {
944 return FALSE; 944 return FALSE;
945 } 945 }
946 946
947 LLQuaternion quat; 947 LLQuaternion quat;
948 S32 count = sscanf( buf, "%f %f %f %f", quat.mQ + 0, quat.mQ + 1, quat.mQ + 2, quat.mQ + 3 ); 948 S32 count = sscanf( buf.c_str(), "%f %f %f %f", quat.mQ + 0, quat.mQ + 1, quat.mQ + 2, quat.mQ + 3 );
949 if( 4 == count ) 949 if( 4 == count )
950 { 950 {
951 value->set( quat ); 951 value->set( quat );