Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STORM-1870 and Have a space before old names in parentheses, like V3.

Browse Source 
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
This commit is contained in:
Lirusaito
2012-06-09 17:07:20 -04:00
parent 0d87d3dc1c
commit 0ad533d94d
14 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/llkeyframemotion.cpp
View File

@@ -480,7 +480,7 @@ LLPointer<LLJointState>& LLKeyframeMotion::getJointState(U32 index)
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// getJoin() // getJoint()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
LLJoint* LLKeyframeMotion::getJoint(U32 index) LLJoint* LLKeyframeMotion::getJoint(U32 index)
{ {

2
indra/llcommon/indra_constants.h
View File

@@ -375,7 +375,7 @@ const U32 PARCEL_MEDIA_COMMAND_LOOP_SET = 13;
const U32 MAP_ITEM_TELEHUB = 0x01; const U32 MAP_ITEM_TELEHUB = 0x01;
const U32 MAP_ITEM_PG_EVENT = 0x02; const U32 MAP_ITEM_PG_EVENT = 0x02;
const U32 MAP_ITEM_MATURE_EVENT = 0x03; const U32 MAP_ITEM_MATURE_EVENT = 0x03;
const U32 MAP_ITEM_POPULAR = 0x04; //const U32 MAP_ITEM_POPULAR = 0x04; // No longer supported, 2009-03-02 KLW
//const U32 MAP_ITEM_AGENT_COUNT = 0x05; //const U32 MAP_ITEM_AGENT_COUNT = 0x05;
const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06; const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06;
const U32 MAP_ITEM_LAND_FOR_SALE = 0x07; const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;

3
indra/llcommon/llapp.cpp
View File

@@ -74,7 +74,7 @@ S32 LL_HEARTBEAT_SIGNAL = (SIGRTMAX >= 0) ? (SIGRTMAX-0) : SIGUSR2;
// the static application instance // the static application instance
LLApp* LLApp::sApplication = NULL; LLApp* LLApp::sApplication = NULL;
// Allows the generation of core files for post mortum under gdb // Allows the generation of core files for post mortem under gdb
// and disables crashlogger // and disables crashlogger
BOOL LLApp::sDisableCrashlogger = FALSE; BOOL LLApp::sDisableCrashlogger = FALSE;
@@ -396,6 +396,7 @@ bool LLApp::isQuitting()
return (APP_STATUS_QUITTING == sStatus); return (APP_STATUS_QUITTING == sStatus);
} }
// static
bool LLApp::isExiting() bool LLApp::isExiting()
{ {
return isQuitting() || isError(); return isQuitting() || isError();

2
indra/llcommon/llavatarname.cpp
View File

@@ -99,7 +99,7 @@ std::string LLAvatarName::getCompleteName(bool linefeed) const
} }
else else
{ {
name = mDisplayName + (linefeed ? "\n(" : "(") + mUsername + ")"; name = mDisplayName + (linefeed ? "\n(" : " (") + mUsername + ")";
} }
return name; return name;
} }

2
indra/llcommon/llbase32.h
View File

@@ -32,7 +32,7 @@
*/ */
#ifndef LLBASE32_H #ifndef LLBASE32_H
#define LLBASE32_h #define LLBASE32_H
class LL_COMMON_API LLBase32 class LL_COMMON_API LLBase32
{ {

2
indra/llcommon/llbase64.h
View File

@@ -32,7 +32,7 @@
*/ */
#ifndef LLBASE64_H #ifndef LLBASE64_H
#define LLBASE64_h #define LLBASE64_H
class LL_COMMON_API LLBase64 class LL_COMMON_API LLBase64
{ {

10
indra/llcommon/llcursortypes.cpp
View File

@@ -30,6 +30,8 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#include "linden_common.h"
#include "llcursortypes.h" #include "llcursortypes.h"
ECursorType getCursorFromString(const std::string& cursor_string) ECursorType getCursorFromString(const std::string& cursor_string)
@@ -66,14 +68,14 @@ ECursorType getCursorFromString(const std::string& cursor_string)
cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN; cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN;
cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN; cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN;
cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3; cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3;
cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY; cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY;
cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE; cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN; cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE; cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE;
cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
} }
std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string); std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string);

10
indra/llcommon/llcursortypes.h
View File

@@ -33,8 +33,6 @@
#ifndef LL_LLCURSORTYPES_H #ifndef LL_LLCURSORTYPES_H
#define LL_LLCURSORTYPES_H #define LL_LLCURSORTYPES_H
#include "linden_common.h"
// If you add types here, add them in LLCursor::getCursorFromString // If you add types here, add them in LLCursor::getCursorFromString
enum ECursorType { enum ECursorType {
UI_CURSOR_ARROW, UI_CURSOR_ARROW,
@@ -66,14 +64,14 @@ enum ECursorType {
UI_CURSOR_TOOLPAN, UI_CURSOR_TOOLPAN,
UI_CURSOR_TOOLZOOMIN, UI_CURSOR_TOOLZOOMIN,
UI_CURSOR_TOOLPICKOBJECT3, UI_CURSOR_TOOLPICKOBJECT3,
UI_CURSOR_TOOLSIT,
UI_CURSOR_TOOLBUY,
UI_CURSOR_TOOLPAY,
UI_CURSOR_TOOLOPEN,
UI_CURSOR_TOOLPLAY, UI_CURSOR_TOOLPLAY,
UI_CURSOR_TOOLPAUSE, UI_CURSOR_TOOLPAUSE,
UI_CURSOR_TOOLMEDIAOPEN, UI_CURSOR_TOOLMEDIAOPEN,
UI_CURSOR_PIPETTE, UI_CURSOR_PIPETTE,
UI_CURSOR_TOOLSIT,
UI_CURSOR_TOOLBUY,
UI_CURSOR_TOOLPAY,
UI_CURSOR_TOOLOPEN,
UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor) UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor)
}; };

2
indra/llcommon/llerror.cpp
View File

@@ -402,7 +402,7 @@ namespace
{ {
/* This pattern, of returning a reference to a static function /* This pattern, of returning a reference to a static function
variable, is to ensure that this global is constructed before variable, is to ensure that this global is constructed before
it is used, no matter what the global initializeation sequence it is used, no matter what the global initialization sequence
is. is.
See C++ FAQ Lite, sections 10.12 through 10.14 See C++ FAQ Lite, sections 10.12 through 10.14
*/ */

14
indra/llcommon/llerror.h
View File

@@ -45,7 +45,7 @@
Information for most users: Information for most users:
Code can log messages with constuctions like this: Code can log messages with constructions like this:
LL_INFOS("StringTag") << "request to fizzbip agent " << agent_id LL_INFOS("StringTag") << "request to fizzbip agent " << agent_id
<< " denied due to timeout" << LL_ENDL; << " denied due to timeout" << LL_ENDL;
@@ -53,9 +53,9 @@
Messages can be logged to one of four increasing levels of concern, Messages can be logged to one of four increasing levels of concern,
using one of four "streams": using one of four "streams":
LL_DEBUGS("StringTag") - debug messages that are normally supressed LL_DEBUGS("StringTag") - debug messages that are normally suppressed
LL_INFOS("StringTag") - informational messages that are normall shown LL_INFOS("StringTag") - informational messages that are normally shown
LL_WARNS("StringTag") - warning messages that singal a problem LL_WARNS("StringTag") - warning messages that signal a problem
LL_ERRS("StringTag") - error messages that are major, unrecoverable failures LL_ERRS("StringTag") - error messages that are major, unrecoverable failures
The later (LL_ERRS("StringTag")) automatically crashes the process after the message The later (LL_ERRS("StringTag")) automatically crashes the process after the message
@@ -96,7 +96,7 @@
WARN: LLFoo::doSomething: called with a big value for i: 283 WARN: LLFoo::doSomething: called with a big value for i: 283
Which messages are logged and which are supressed can be controled at run Which messages are logged and which are suppressed can be controlled at run
time from the live file logcontrol.xml based on function, class and/or time from the live file logcontrol.xml based on function, class and/or
source file. See etc/logcontrol-dev.xml for details. source file. See etc/logcontrol-dev.xml for details.
@@ -112,7 +112,7 @@ namespace LLError
enum ELevel enum ELevel
{ {
LEVEL_ALL = 0, LEVEL_ALL = 0,
// used to indicate that all messagess should be logged // used to indicate that all messages should be logged
LEVEL_DEBUG = 0, LEVEL_DEBUG = 0,
LEVEL_INFO = 1, LEVEL_INFO = 1,
@@ -226,7 +226,7 @@ namespace LLError
// See top of file for example of how to use this // See top of file for example of how to use this
typedef LLError::NoClassInfo _LL_CLASS_TO_LOG; typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
// Outside a class declartion, or in class without LOG_CLASS(), this // Outside a class declaration, or in class without LOG_CLASS(), this
// typedef causes the messages to not be associated with any class. // typedef causes the messages to not be associated with any class.

8
indra/llcommon/llerrorthread.cpp
View File

@@ -31,6 +31,7 @@
#include "linden_common.h" #include "linden_common.h"
#include "llerrorthread.h" #include "llerrorthread.h"
#include "llapp.h" #include "llapp.h"
#include "lltimer.h" // ms_sleep() #include "lltimer.h" // ms_sleep()
@@ -117,13 +118,8 @@ void LLErrorThread::run()
#if !LL_WINDOWS #if !LL_WINDOWS
U32 last_sig_child_count = 0; U32 last_sig_child_count = 0;
#endif #endif
while (1) while (! (LLApp::isError() || LLApp::isStopped()))
{ {
if (LLApp::isError() || LLApp::isStopped())
{
// The application has stopped running, time to take action (maybe)
break;
}
#if !LL_WINDOWS #if !LL_WINDOWS
// Check whether or not the main thread had a sig child we haven't handled. // Check whether or not the main thread had a sig child we haven't handled.
U32 current_sig_child_count = LLApp::getSigChildCount(); U32 current_sig_child_count = LLApp::getSigChildCount();

3
indra/llcommon/llmd5.h
View File

@@ -134,7 +134,4 @@ private:
LL_COMMON_API bool operator==(const LLMD5& a, const LLMD5& b); LL_COMMON_API bool operator==(const LLMD5& a, const LLMD5& b);
LL_COMMON_API bool operator!=(const LLMD5& a, const LLMD5& b); LL_COMMON_API bool operator!=(const LLMD5& a, const LLMD5& b);
LL_COMMON_API bool operator==(const LLMD5& a, const LLMD5& b);
LL_COMMON_API bool operator!=(const LLMD5& a, const LLMD5& b);
#endif // LL_LLMD5_H #endif // LL_LLMD5_H

6
indra/llmath/llmath.h
View File

@@ -91,7 +91,7 @@ const F32 F_ALMOST_ONE = 1.0f - F_ALMOST_ZERO;
const F32 FP_MAG_THRESHOLD = 0.0000001f; const F32 FP_MAG_THRESHOLD = 0.0000001f;
// TODO: Replace with logic like is_approx_equal // TODO: Replace with logic like is_approx_equal
inline BOOL is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f < F_APPROXIMATELY_ZERO); } inline bool is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f < F_APPROXIMATELY_ZERO); }
// These functions work by interpreting sign+exp+mantissa as an unsigned // These functions work by interpreting sign+exp+mantissa as an unsigned
// integer. // integer.
@@ -117,13 +117,13 @@ inline BOOL is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f <
// WARNING: Infinity is comparable with F32_MAX and negative // WARNING: Infinity is comparable with F32_MAX and negative
// infinity is comparable with F32_MIN // infinity is comparable with F32_MIN
inline BOOL is_approx_equal(F32 x, F32 y) inline bool is_approx_equal(F32 x, F32 y)
{ {
const S32 COMPARE_MANTISSA_UP_TO_BIT = 0x02; const S32 COMPARE_MANTISSA_UP_TO_BIT = 0x02;
return (std::abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT); return (std::abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
} }
inline BOOL is_approx_equal(F64 x, F64 y) inline bool is_approx_equal(F64 x, F64 y)
{ {
const S64 COMPARE_MANTISSA_UP_TO_BIT = 0x02; const S64 COMPARE_MANTISSA_UP_TO_BIT = 0x02;
return (std::abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT); return (std::abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);

2
indra/newview/lltracker.cpp
View File

@@ -263,7 +263,7 @@ void LLTracker::render3D()
instance()->mBeaconText->setDoFade(FALSE); instance()->mBeaconText->setDoFade(FALSE);
} }
F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->mTrackedPositionGlobal, 0.0f); F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->getTrackedPositionGlobal(), 0.0f);
if (dist < DESTINATION_REACHED_RADIUS) if (dist < DESTINATION_REACHED_RADIUS)
{ {
instance()->stopTrackingAvatar(); instance()->stopTrackingAvatar();