diff options
| author | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
|---|---|---|
| committer | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
| commit | 2f438a409e7777020269c73df1b6cae83669e664 (patch) | |
| tree | ada6125f611c74283843dedeab981ed538bd8e29 /indra/newview/llviewerregion.cpp | |
| parent | c94062fb5b4d0ddbbd8b623e209d725b50a59851 (diff) | |
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 3bc529a9e3..cc93ea8bdc 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -724,7 +724,10 @@ void LLViewerRegion::calculateCameraDistance() mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared(); } -// ---------------- Friends ---------------- +U32 LLViewerRegion::getNetDetailsForLCD() +{ + return mPingDelay; +} std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion) { |