Up-to-date LSL/OSSL source highlighting

etc/message.xml

@@ -673,6 +673,9 @@
 			<key>FetchInventoryDescendents</key>
 			<boolean>false</boolean>
 
+			<key>WebFetchInventoryDescendents</key>
+			<boolean>true</boolean>
+
 			<key>FetchInventory</key>
 			<boolean>true</boolean>
 

indra/cmake/00-Common.cmake

@@ -230,7 +230,7 @@ if (LINUX)
 	endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
+  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG} -msse2")
   set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
   set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
   set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}")

indra/llcommon/indra_constants.h

@@ -153,6 +153,11 @@ const	char	LAND_LAYER_CODE					= 'L';
 const	char	WATER_LAYER_CODE				= 'W';
 const	char	WIND_LAYER_CODE					= '7';
 const	char	CLOUD_LAYER_CODE				= '8';
+// Extended land layer for Aurora Sim
+const   char    AURORA_LAND_LAYER_CODE          = 'M';
+const	char	AURORA_WATER_LAYER_CODE			= 'X';
+const   char    AURORA_WIND_LAYER_CODE          = '9';
+const   char    AURORA_CLOUD_LAYER_CODE         = ':';
 
 // keys
 // Bit masks for various keyboard modifier keys.

indra/llcommon/llapp.cpp

@@ -249,15 +249,6 @@ LLSD LLApp::getOptionData(OptionPriority level)
 	return mOptions[level];
 }
 
-void LLApp::stepFrame()
-{
-	LLFrameTimer::updateFrameTime();
-	LLFrameTimer::updateFrameCount();
-	LLEventTimer::updateClass();
-	mRunner.run();
-}
-
-
 void LLApp::setupErrorHandling()
 {
 	// Error handling is done by starting up an error handling thread, which just sleeps and

indra/llcommon/llapp.h

@@ -236,17 +236,6 @@ class LL_COMMON_API LLApp : public LLOptionInterface
 	pid_t fork(); 
 #endif
 
-	/**
-	  * @brief Get a reference to the application runner
-	  *
-	  * Please use the runner with caution. Since the Runner usage
-	  * pattern is not yet clear, this method just gives access to it
-	  * to add and remove runnables.
-	  * @return Returns the application runner. Do not save the
-	  * pointer past the caller's stack frame.
-	  */
-	LLRunner& getRunner() { return mRunner; }
-
 public:
 	typedef std::map<std::string, std::string> string_map;
 	string_map mOptionMap;	// Contains all command-line options and arguments in a map
@@ -264,11 +253,6 @@ class LL_COMMON_API LLApp : public LLOptionInterface
 	static LLAppChildCallback sDefaultChildCallback;
 #endif
 
-	/**
-	  * @brief This method is called once a frame to do once a frame tasks.
-	  */
-	void stepFrame();
-
 	/**
 	 * @ brief This method is called once as soon as logging is initialized.
 	 */
@@ -289,9 +273,6 @@ class LL_COMMON_API LLApp : public LLOptionInterface
 	// Default application threads
 	LLErrorThread* mThreadErrorp;		// Waits for app to go to status ERROR, then runs the error callback
 
-	// This is the application level runnable scheduler.
-	LLRunner mRunner;
-
 	/** @name Runtime option implementation */
 	//@{
 

indra/llcommon/llframetimer.cpp

@@ -4,6 +4,7 @@
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
  * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2011, Aleric Inglewood.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,48 +36,55 @@
 
 #include "llframetimer.h"
 
+// Local constants.
+static F64 const USEC_PER_SECOND = 1000000.0;
+static F64 const USEC_TO_SEC_F64 = 0.000001;
+
 // Static members
-//LLTimer	LLFrameTimer::sInternalTimer;
-U64 LLFrameTimer::sStartTotalTime = totalTime();
-F64 LLFrameTimer::sFrameTime = 0.0;
-U64 LLFrameTimer::sTotalTime = 0;
-F64 LLFrameTimer::sTotalSeconds = 0.0;
-S32 LLFrameTimer::sFrameCount = 0;
-U64 LLFrameTimer::sFrameDeltaTime = 0;
-const F64 USEC_PER_SECOND = 1000000.0;
-const F64 USEC_TO_SEC_F64 = 0.000001;
+U64 const LLFrameTimer::sStartTotalTime = totalTime();				// Application start in microseconds since epoch.
+U64 LLFrameTimer::sTotalTime = LLFrameTimer::sStartTotalTime;		// Current time in microseconds since epoch, updated at least once per frame.
+F64 LLFrameTimer::sTotalSeconds =									// Current time in seconds since epoch, updated together with LLFrameTimer::sTotalTime.
+        U64_to_F64(LLFrameTimer::sTotalTime) * USEC_TO_SEC_F64;
+F64 LLFrameTimer::sFrameTime = 0.0;									// Current time in seconds since application start, updated together with LLFrameTimer::sTotalTime.
+// Updated exactly once per frame:
+S32 LLFrameTimer::sFrameCount = 0;									// Current frame number (number of frames since application start).
+U64 LLFrameTimer::sPrevTotalTime = LLFrameTimer::sStartTotalTime;	// Previous (frame) time in microseconds since epoch, updated once per frame.
+U64 LLFrameTimer::sFrameDeltaTime = 0;								// Microseconds between last two calls to LLFrameTimer::updateFrameTimeAndCount.
 
 // static
 void LLFrameTimer::updateFrameTime()
 {
-	U64 total_time = totalTime();
-	sFrameDeltaTime = total_time - sTotalTime;
-	sTotalTime = total_time;
+	sTotalTime = totalTime();
 	sTotalSeconds = U64_to_F64(sTotalTime) * USEC_TO_SEC_F64;
 	sFrameTime = U64_to_F64(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;
 } 
 
-void LLFrameTimer::start()
+// static
+void LLFrameTimer::updateFrameTimeAndCount()
 {
-	reset();
-	mStarted = TRUE;
+	updateFrameTime();
+	sFrameDeltaTime = sTotalTime - sPrevTotalTime;
+	sPrevTotalTime = sTotalTime;
+	++sFrameCount;
 }
 
-void LLFrameTimer::stop()
+void LLFrameTimer::reset(F32 expiration)
 {
-	mStarted = FALSE;
+	llassert(!mPaused);
+	mStartTime = sFrameTime;
+	mExpiry = sFrameTime + expiration;
 }
 
-void LLFrameTimer::reset()
+void LLFrameTimer::start(F32 expiration)
 {
-	mStartTime = sFrameTime;
-	mExpiry = sFrameTime;
+	reset(expiration);
+	mRunning = true;							// Start, if not already started.
 }
 
-void LLFrameTimer::resetWithExpiry(F32 expiration)
+void LLFrameTimer::stop()
 {
-	reset();
-	setTimerExpirySec(expiration);
+	llassert(!mPaused);
+	mRunning = false;
 }
 
 // Don't combine pause/unpause with start/stop
@@ -89,25 +97,31 @@ void LLFrameTimer::resetWithExpiry(F32 expiration)
 //  Note: elapsed would also be valid with no unpause() call (= time run until pause() called)
 void LLFrameTimer::pause()
 {
-	if (mStarted)
-		mStartTime = sFrameTime - mStartTime; // save dtime
-	mStarted = FALSE;
+	if (!mPaused)
+	{
+		mStartTime = sFrameTime - mStartTime;	// Abuse mStartTime to store the elapsed time so far.
+	}
+	mPaused = true;
 }
 
 void LLFrameTimer::unpause()
 {
-	if (!mStarted)
-		mStartTime = sFrameTime - mStartTime; // restore dtime
-	mStarted = TRUE;
+	if (mPaused)
+	{
+		mStartTime = sFrameTime - mStartTime;	// Set mStartTime consistent with the elapsed time so far.
+	}
+	mPaused = false;
 }
 
 void LLFrameTimer::setTimerExpirySec(F32 expiration)
 {
-	mExpiry = expiration + mStartTime;
+	llassert(!mPaused);
+	mExpiry = mStartTime + expiration;
 }
 
 void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch)
 {
+	llassert(!mPaused);
 	mStartTime = sFrameTime;
 	mExpiry = seconds_since_epoch - (USEC_TO_SEC_F64 * sStartTotalTime);
 }
@@ -119,20 +133,14 @@ F64 LLFrameTimer::expiresAt() const
 	return expires_at;
 }
 
-BOOL LLFrameTimer::checkExpirationAndReset(F32 expiration)
+bool LLFrameTimer::checkExpirationAndReset(F32 expiration)
 {
-	//llinfos << "LLFrameTimer::checkExpirationAndReset()" << llendl;
-	//llinfos << "  mStartTime:" << mStartTime << llendl;
-	//llinfos << "  sFrameTime:" << sFrameTime << llendl;
-	//llinfos << "  mExpiry:   " <<  mExpiry << llendl;
-
-	if(hasExpired())
+	if (hasExpired())
 	{
-		reset();
-		setTimerExpirySec(expiration);
-		return TRUE;
+		reset(expiration);
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 // static