summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NORSPEC-207.patch164
-rw-r--r--indra/linux_updater/linux_updater.cpp1
-rwxr-xr-xindra/llcommon/llerror.cpp25
-rwxr-xr-xindra/llcommon/llerror.h12
-rwxr-xr-xindra/llcommon/lltimer.cpp11
-rwxr-xr-xindra/llcommon/lltimer.h13
-rw-r--r--indra/llcommon/lltraceaccumulators.h1
-rw-r--r--indra/llcommon/tests/llunits_test.cpp6
-rwxr-xr-xindra/llui/llnotifications.h5
-rwxr-xr-xindra/llui/llstatbar.cpp21
-rwxr-xr-xindra/newview/llappviewer.cpp12
-rw-r--r--indra/newview/llscenemonitor.cpp1
-rw-r--r--indra/newview/llscenemonitor.h2
-rwxr-xr-xindra/newview/llstartup.cpp1
-rwxr-xr-xindra/newview/llviewermessage.cpp4
-rwxr-xr-xindra/newview/llviewerobject.cpp2
-rwxr-xr-xindra/newview/pipeline.cpp12
17 files changed, 83 insertions, 210 deletions
diff --git a/NORSPEC-207.patch b/NORSPEC-207.patch
deleted file mode 100644
index a1c1447bda..0000000000
--- a/NORSPEC-207.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -r fe4bab01522e indra/llprimitive/llrendermaterialtable.cpp
---- a/indra/llprimitive/llrendermaterialtable.cpp Wed May 15 17:57:21 2013 +0000
-+++ b/indra/llprimitive/llrendermaterialtable.cpp Wed May 22 14:23:04 2013 -0700
-@@ -184,6 +184,44 @@
- }
- }
-
-+// 'v' is an integer value for 100ths of radians (don't ask...)
-+//
-+void LLRenderMaterialEntry::LLRenderMaterial::setSpecularMapRotation(S32 v) const
-+{
-+ // Store the fact that we're using the new rotation rep
-+ //
-+ m_flags |= kNewSpecularMapRotation;
-+
-+ // Store 'sign bit' in our m_flags
-+ //
-+ m_flags &= ~kSpecularMapRotationNegative;
-+ m_flags |= (specularMapRotation < 0) ? kSpecularMapRotationNegative : 0;
-+
-+ specularRotation = abs(specularRotation);
-+ specularRotation = llmin(specularRotation, MAX_MATERIAL_MAP_ROTATION);
-+
-+ m_specularRotation = (U16)(abs(specularMapRotation));
-+}
-+
-+// 'v' is an integer value for 100ths of radians (don't ask...)
-+//
-+void LLRenderMaterialEntry::LLRenderMaterial::setNormalMapRotation(S32 v) const
-+{
-+
-+ // Store the fact that we're using the new rep for this material
-+ //
-+ m_flags |= kNewNormalMapRotation;
-+
-+ // Store 'sign bit' in our m_flags
-+ //
-+ m_flags &= ~kNormalMapRotationNegative;
-+ m_flags |= (normalMapRotation < 0) ? kNormalMapRotationNegative : 0;
-+
-+ normalRotation = abs(normalRotation);
-+ normalRotation = llmin(normalRotation, MAX_MATERIAL_MAP_ROTATION);
-+
-+ m_normalRotation = (U16)(abs(normalMapRotation));
-+}
-
- void LLRenderMaterialEntry::LLRenderMaterial::asLLSD( LLSD& dest ) const
- {
-@@ -193,20 +231,45 @@
- dest["NormOffsetY"] = (S32)m_normalOffsetY;
- dest["NormRepeatX"] = m_normalRepeatX;
- dest["NormRepeatY"] = m_normalRepeatY;
-- dest["NormRotation"] = (S32)m_normalRotation;
-+
-+ S32 value = (S32)m_normalMapRotation;
-+
-+ // If we don't have the flag for new rotations set,
-+ // then we need to convert it now
-+ if (!(m_flags & kNewNormalMapRotation))
-+ {
-+ F32 old_radians = ((F32)m_normalMapRotation / 10000.0f)
-+ S32 new_val = (S32)(old_radians * 100.0f);
-+ setNormalMapRotation(new_Val);
-+ }
-+
-+ dest["NormRotation"] = (m_flags & kNormalMapRotationNegative) ? -(S32)m_normalRotation : (S32)m_normalRotation;
-
- dest["SpecOffsetX"] = (S32)m_specularOffsetX;
- dest["SpecOffsetY"] = (S32)m_specularOffsetY;
- dest["SpecRepeatX"] = m_specularRepeatX;
- dest["SpecRepeatY"] = m_specularRepeatY;
-- dest["SpecRotation"] = (S32)m_specularRotation;
-+
-+
-+ value = (S32)m_specularRotation;
-+
-+ // If we don't have the flag for new rotations set,
-+ // then we need to convert it now
-+ if (!(m_flags & kNewSpecularMapRotation))
-+ {
-+ F32 old_radians = ((F32)m_specularMapRotation / 10000.0f)
-+ S32 new_val = (S32)(old_radians * 100.0f);
-+ setSpecularMapRotation(new_Val);
-+ }
-+
-+ dest["SpecRotation"] = (m_flags & kSpecularMapRotationNegative) ? -(S32)m_specularRotation : (S32)m_specularRotation;
-
- dest["SpecMap"] = m_specularMap;
- dest["SpecColor"] = m_specularLightColor.getValue();
- dest["SpecExp"] = (S32)m_specularLightExponent;
- dest["EnvIntensity"] = (S32)m_environmentIntensity;
- dest["AlphaMaskCutoff"] = (S32)m_alphaMaskCutoff;
-- dest["DiffuseAlphaMode"] = (S32)m_diffuseAlphaMode;
-+ dest["DiffuseAlphaMode"] = (S32)(m_diffuseAlphaMode & 0xF);
-
- }
-
-@@ -217,7 +280,10 @@
- m_normalOffsetY = (U16)materialDefinition["NormOffsetY"].asInteger();
- m_normalRepeatX = materialDefinition["NormRepeatX"].asInteger();
- m_normalRepeatY = materialDefinition["NormRepeatY"].asInteger();
-- m_normalRotation = (U16)materialDefinition["NormRotation"].asInteger();
-+
-+ S32 normalRotation = materialDefinition["NormRotation"].asInteger();
-+
-+ setNormalMapRotation(normalRotation);
-
- m_specularMap = materialDefinition["SpecMap"].asUUID();
-
-@@ -225,7 +291,10 @@
- m_specularOffsetY = (U16)materialDefinition["SpecOffsetY"].asInteger();
- m_specularRepeatX = materialDefinition["SpecRepeatX"].asInteger();
- m_specularRepeatY = materialDefinition["SpecRepeatY"].asInteger();
-- m_specularRotation = (U16)materialDefinition["SpecRotation"].asInteger();
-+
-+ S32 specularRotation = materialDefinition["SpecRotation"].asInteger();
-+
-+ setSpecularMapRotation(specularRotation);
-
- m_specularLightColor.setValue( materialDefinition["SpecColor"] );
- m_specularLightExponent = (U8)materialDefinition["SpecExp"].asInteger();
-diff -r fe4bab01522e indra/llprimitive/llrendermaterialtable.h
---- a/indra/llprimitive/llrendermaterialtable.h Wed May 15 17:57:21 2013 +0000
-+++ b/indra/llprimitive/llrendermaterialtable.h Wed May 22 14:23:04 2013 -0700
-@@ -89,11 +89,17 @@
-
- void computeID();
-
-+
- struct LLRenderMaterial
- {
- void asLLSD( LLSD& dest ) const;
- void setFromLLSD( const LLSD& materialDefinition );
-
-+ void setNormalMapRotation(S32 v);
-+ void setSpecularMapRotation(S32 v);
-+
-+ const S32 MAX_MATERIAL_MAP_ROTATION = 62800;
-+
- // 36 bytes
- LLUUID m_normalMap;
- LLUUID m_specularMap;
-@@ -119,7 +125,20 @@
- U8 m_specularLightExponent;
- U8 m_environmentIntensity;
- U8 m_alphaMaskCutoff;
-- U8 m_diffuseAlphaMode;
-+ U8 m_diffuseAlphaMode : 4;
-+ U8 m_flags : 4;
-+ };
-+
-+ // Flags stored in LLRenderMaterial::m_flags to differentiate 'old' rotation format
-+ // which doesn't handle negative or large rotations correctly from new format.
-+ // All ancient materials will have these flags unset as the values for diffuseAlphaMode
-+ // from which the bits were stolen never used more than the bottom 2 bits.
-+ //
-+ enum RenderMaterialFlags {
-+ kNewNormalMapRotation = 0x1,
-+ kNewSpecularMapRotation = 0x2,
-+ kNormalMapRotationNegative = 0x4,
-+ kSpecularMapRotationNegative = 0x8
- };
-
- friend struct eastl::hash<LLRenderMaterial>;
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp
index 9229520f83..b7d30cc6d2 100644
--- a/indra/linux_updater/linux_updater.cpp
+++ b/indra/linux_updater/linux_updater.cpp
@@ -29,6 +29,7 @@
#include <signal.h>
#include <errno.h>
#include <set>
+#include <iostream>
#include "linden_common.h"
#include "llerrorcontrol.h"
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index d2af004cde..5b4be1ac80 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -158,14 +158,20 @@ namespace {
}
private:
- bool mTimestamp;
- enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
- ANSIState mUseANSI;
+ bool mTimestamp;
+ enum ANSIState
+ {
+ ANSI_PROBE,
+ ANSI_YES,
+ ANSI_NO
+ } mUseANSI;
+
void colorANSI(const std::string color)
{
// ANSI color code escape sequence
fprintf(stderr, "\033[%sm", color.c_str() );
};
+
bool checkANSI(void)
{
#if LL_LINUX || LL_DARWIN
@@ -727,13 +733,13 @@ namespace LLError
namespace LLError
{
Recorder::~Recorder()
- { }
+ {}
// virtual
bool Recorder::wantsTime()
- { return false; }
-
-
+ {
+ return false;
+ }
void addRecorder(Recorder* recorder)
{
@@ -752,9 +758,8 @@ namespace LLError
return;
}
Settings& s = Settings::get();
- s.recorders.erase(
- std::remove(s.recorders.begin(), s.recorders.end(), recorder),
- s.recorders.end());
+ s.recorders.erase(std::remove(s.recorders.begin(), s.recorders.end(), recorder),
+ s.recorders.end());
}
}
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 0b723aeb5d..ceff40e900 100755
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -155,12 +155,12 @@ namespace LLError
// these describe the call site and never change
const ELevel mLevel;
const char* const mFile;
- const int mLine;
- const std::type_info& mClassInfo;
+ const int mLine;
+ const std::type_info& mClassInfo;
const char* const mFunction;
const char* const mBroadTag;
const char* const mNarrowTag;
- const bool mPrintOnce;
+ const bool mPrintOnce;
// these implement a cache of the call to shouldLog()
bool mCached;
@@ -213,7 +213,7 @@ namespace LLError
#endif
//this is cheaper than llcallstacks if no need to output other variables to call stacks.
-#define llpushcallstacks LLError::LLCallStacks::push(__FUNCTION__, __LINE__)
+#define LL_PUSH_CALLSTACKS() LLError::LLCallStacks::push(__FUNCTION__, __LINE__)
#define llcallstacks \
{\
std::ostringstream* _out = LLError::LLCallStacks::insert(__FUNCTION__, __LINE__) ; \
@@ -222,8 +222,8 @@ namespace LLError
LLError::End(); \
LLError::LLCallStacks::end(_out) ; \
}
-#define llclearcallstacks LLError::LLCallStacks::clear()
-#define llprintcallstacks LLError::LLCallStacks::print()
+#define LL_CLEAR_CALLSTACKS() LLError::LLCallStacks::clear()
+#define LL_PRINT_CALLSTACKS() LLError::LLCallStacks::print()
/*
Class type information for logging
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 693809b622..25383fc4d8 100755
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -281,7 +281,18 @@ LLTimer::LLTimer()
}
LLTimer::~LLTimer()
+{}
+
+// static
+void LLTimer::initClass()
+{
+ if (!sTimer) sTimer = new LLTimer;
+}
+
+// static
+void LLTimer::cleanupClass()
{
+ delete sTimer; sTimer = NULL;
}
// static
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 9e464c4b1a..f2dc59e405 100755
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -62,14 +62,21 @@ public:
LLTimer();
~LLTimer();
- static void initClass() { if (!sTimer) sTimer = new LLTimer; }
- static void cleanupClass() { delete sTimer; sTimer = NULL; }
+ static void initClass();
+ static void cleanupClass();
// Return a high precision number of seconds since the start of
// this application instance.
static LLUnitImplicit<F64, LLUnits::Seconds> getElapsedSeconds()
{
- return sTimer->getElapsedTimeF64();
+ if (sTimer)
+ {
+ return sTimer->getElapsedTimeF64();
+ }
+ else
+ {
+ return 0;
+ }
}
// Return a high precision usec since epoch
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index b1aa078f9a..9ea787188c 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -453,6 +453,7 @@ namespace LLTrace
F64 getMean() const { return mMean; }
F64 getStandardDeviation() const { return sqrtf(mSumOfSquares / mTotalSamplingTime); }
U32 getSampleCount() const { return mNumSamples; }
+ bool hasValue() const { return mHasValue; }
private:
F64 mSum,
diff --git a/indra/llcommon/tests/llunits_test.cpp b/indra/llcommon/tests/llunits_test.cpp
index a5df51f6de..e631f18ad4 100644
--- a/indra/llcommon/tests/llunits_test.cpp
+++ b/indra/llcommon/tests/llunits_test.cpp
@@ -34,8 +34,8 @@ namespace LLUnits
{
// using powers of 2 to allow strict floating point equality
LL_DECLARE_BASE_UNIT(Quatloos, "Quat");
- LL_DECLARE_DERIVED_UNIT(Latinum, "Lat", Quatloos, * 4);
- LL_DECLARE_DERIVED_UNIT(Solari, "Sol", Latinum, / 16);
+ LL_DECLARE_DERIVED_UNIT(Quatloos, * 4, Latinum, "Lat");
+ LL_DECLARE_DERIVED_UNIT(Latinum, / 16, Solari, "Sol");
}
namespace tut
@@ -164,7 +164,7 @@ namespace tut
void units_object_t::test<5>()
{
// 0-initialized
- LLUnit<F32, Quatloos> quatloos(0);
+ LLUnit<F32, Quatloos> quatloos;
// initialize implicit unit from explicit
LLUnitImplicit<F32, Quatloos> quatloos_implicit = quatloos + 1;
ensure(quatloos_implicit == 1);
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 2948f88755..f9089b8cc9 100755
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -1056,15 +1056,13 @@ class LLPersistentNotificationChannel : public LLNotificationChannel
public:
LLPersistentNotificationChannel()
: LLNotificationChannel("Persistent", "Visible", &notificationFilter)
- {
- }
+ {}
typedef std::vector<LLNotificationPtr> history_list_t;
history_list_t::iterator beginHistory() { sortHistory(); return mHistory.begin(); }
history_list_t::iterator endHistory() { return mHistory.end(); }
private:
-
struct sortByTime
{
S32 operator ()(const LLNotificationPtr& a, const LLNotificationPtr& b)
@@ -1078,7 +1076,6 @@ private:
std::sort(mHistory.begin(), mHistory.end(), sortByTime());
}
-
// The channel gets all persistent notifications except those that have been canceled
static bool notificationFilter(LLNotificationPtr pNotification)
{
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index d9f4a36f8d..2543bd8f0a 100755
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -226,8 +226,7 @@ void LLStatBar::draw()
max = 0,
mean = 0;
-
- S32 num_samples = 0;
+ bool show_data = false;
LLLocalClipRect _(getLocalRect());
LLTrace::PeriodicRecording& frame_recording = LLTrace::get_frame_recording();
@@ -240,7 +239,6 @@ void LLStatBar::draw()
if (mPerSec)
{
unit_label += "/s";
- num_samples = frame_recording.getSampleCount(*mCountFloatp, mNumFrames);
current = last_frame_recording.getPerSec(*mCountFloatp);
min = frame_recording.getPeriodMinPerSec(*mCountFloatp, mNumFrames);
max = frame_recording.getPeriodMaxPerSec(*mCountFloatp, mNumFrames);
@@ -248,34 +246,41 @@ void LLStatBar::draw()
}
else
{
- num_samples = frame_recording.getSampleCount(*mCountFloatp, mNumFrames);
current = last_frame_recording.getSum(*mCountFloatp);
min = frame_recording.getPeriodMin(*mCountFloatp, mNumFrames);
max = frame_recording.getPeriodMax(*mCountFloatp, mNumFrames);
mean = frame_recording.getPeriodMean(*mCountFloatp, mNumFrames);
}
+
+ // always show count-style data
+ show_data = true;
}
else if (mEventFloatp)
{
LLTrace::Recording& last_frame_recording = frame_recording.getLastRecording();
unit_label = mUnitLabel.empty() ? mEventFloatp->getUnitLabel() : mUnitLabel;
- num_samples = frame_recording.getSampleCount(*mEventFloatp, mNumFrames);
+ // only show data if there is an event in the relevant time period
current = last_frame_recording.getMean(*mEventFloatp);
min = frame_recording.getPeriodMin(*mEventFloatp, mNumFrames);
max = frame_recording.getPeriodMax(*mEventFloatp, mNumFrames);
mean = frame_recording.getPeriodMean(*mEventFloatp, mNumFrames);
+
+ show_data = frame_recording.getSampleCount(*mEventFloatp, mNumFrames) != 0;
}
else if (mSampleFloatp)
{
+
LLTrace::Recording& last_frame_recording = frame_recording.getLastRecording();
unit_label = mUnitLabel.empty() ? mSampleFloatp->getUnitLabel() : mUnitLabel;
- num_samples = frame_recording.getSampleCount(*mSampleFloatp, mNumFrames);
current = last_frame_recording.getMean(*mSampleFloatp);
min = frame_recording.getPeriodMin(*mSampleFloatp, mNumFrames);
max = frame_recording.getPeriodMax(*mSampleFloatp, mNumFrames);
mean = frame_recording.getPeriodMean(*mSampleFloatp, mNumFrames);
+
+ // always show sample data if we've ever grabbed any samples
+ show_data = mSampleFloatp->getPrimaryAccumulator()->hasValue();
}
S32 bar_top, bar_left, bar_right, bar_bottom;
@@ -337,7 +342,7 @@ void LLStatBar::draw()
{
decimal_digits = 0;
}
- std::string value_str = num_samples
+ std::string value_str = show_data
? llformat("%10.*f %s", decimal_digits, mean, unit_label.c_str())
: "n/a";
@@ -454,7 +459,7 @@ void LLStatBar::draw()
gl_rect_2d(begin, bar_top, end, bar_bottom, LLColor4(1.f, 0.f, 0.f, 0.25f));
}
- if (num_samples)
+ if (show_data)
{
F32 span = (mOrientation == HORIZONTAL)
? (bar_right - bar_left)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5f6b183fcc..a208745822 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -660,8 +660,13 @@ LLTextureCache* LLAppViewer::sTextureCache = NULL;
LLImageDecodeThread* LLAppViewer::sImageDecodeThread = NULL;
LLTextureFetch* LLAppViewer::sTextureFetch = NULL;
-LLAppViewer::LLAppViewer() :
- mMarkerFile(),
+std::string getRuntime()
+{
+ return llformat("%g", LLTimer::getElapsedSeconds().value());
+}
+
+LLAppViewer::LLAppViewer()
+: mMarkerFile(),
mLogoutMarkerFile(),
mReportedCrash(false),
mNumSessions(0),
@@ -1300,7 +1305,7 @@ bool LLAppViewer::mainLoop()
LLTrace::get_master_thread_recorder()->pullFromChildren();
//clear call stack records
- llclearcallstacks;
+ LL_CLEAR_CALLSTACKS();
//check memory availability information
checkMemory() ;
@@ -2148,6 +2153,7 @@ void LLAppViewer::initLoggingAndGetLastDuration()
LLError::initForApplication(
gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
LLError::setFatalFunction(errorCallback);
+ //LLError::setTimeFunction(getRuntime);
// Remove the last ".old" log file.
std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 29dd140158..022a950ece 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -491,7 +491,6 @@ void LLSceneMonitor::fetchQueryResult()
if(mDiffResult > diff_threshold())
{
mSceneLoadRecording.extend();
- llinfos << mSceneLoadRecording.getResults().getLastRecording().getDuration() << llendl;
llassert_always(mSceneLoadRecording.getResults().getLastRecording().getDuration() > scene_load_sample_time);
}
else
diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h
index b857389243..f94232e536 100644
--- a/indra/newview/llscenemonitor.h
+++ b/indra/newview/llscenemonitor.h
@@ -100,7 +100,7 @@ private:
std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
- LLFrameTimer mRecordingTimer;
+ LLTimer mRecordingTimer;
LLTrace::ExtendablePeriodicRecording mSceneLoadRecording;
LLTrace::Recording mMonitorRecording;
};
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 097ea7cc8d..536c030637 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1185,6 +1185,7 @@ bool idle_startup()
// create the default proximal channel
LLVoiceChannel::initClass();
LLStartUp::setStartupState( STATE_WORLD_INIT);
+ LLTrace::get_frame_recording().reset();
}
else
{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c33efd4255..970f6913cb 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -358,7 +358,7 @@ void process_logout_reply(LLMessageSystem* msg, void**)
{
LL_INFOS("Messaging") << "process_logout_reply item not found: " << item_id << LL_ENDL;
}
- }
+ }
LLAppViewer::instance()->forceQuit();
}
@@ -366,6 +366,8 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
{
LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(mesgsys->getSender());
+ LL_DEBUGS_ONCE("SceneLoadTiming") << "Received layer data" << LL_ENDL;
+
if(!regionp)
{
llwarns << "Invalid region for layer data." << llendl;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 4e514ddfd1..e834febad5 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1043,6 +1043,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
const EObjectUpdateType update_type,
LLDataPacker *dp)
{
+ LL_DEBUGS_ONCE("SceneLoadTiming") << "Received viewer object data" << LL_ENDL;
+
U32 retval = 0x0;
// If region is removed from the list it is also deleted.
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 34d7e0ab64..870ee6a103 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3757,7 +3757,7 @@ void LLPipeline::postSort(LLCamera& camera)
assertInitialized();
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
//rebuild drawable geometry
for (LLCullResult::sg_iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)
{
@@ -3768,12 +3768,12 @@ void LLPipeline::postSort(LLCamera& camera)
group->rebuildGeom();
}
}
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
//rebuild groups
sCull->assertDrawMapsEmpty();
rebuildPriorityGroups();
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
//build render map
@@ -3884,7 +3884,7 @@ void LLPipeline::postSort(LLCamera& camera)
std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater());
}
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
// only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
if (LLFloaterReg::instanceVisible("beacons") && !sShadowRender)
{
@@ -3937,7 +3937,7 @@ void LLPipeline::postSort(LLCamera& camera)
forAllVisibleDrawables(renderSoundHighlights);
}
}
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
// If managing your telehub, draw beacons at telehub and currently selected spawnpoint.
if (LLFloaterTelehub::renderBeacons())
{
@@ -3973,7 +3973,7 @@ void LLPipeline::postSort(LLCamera& camera)
}
//LLSpatialGroup::sNoDelete = FALSE;
- llpushcallstacks ;
+ LL_PUSH_CALLSTACKS();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 13:02:09 +0000