From deb2791e55ad1b79fbc44d5d8417301889823ad6 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 28 Apr 2010 18:27:10 -0700 Subject: added optimization for media volume level of 1.0 (don't do anything) --- indra/media_plugins/winmmshim/winmm_shim.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index f7df3b19a0..88c2a28443 100644 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -120,8 +120,8 @@ extern "C" { // zero out the audio buffer when muted memset(pwh->lpData, 0, pwh->dwBufferLength); } - else - { + else if (sVolumeLevel != 1.f) + { // need to apply volume level wave_out_map_t::iterator found_it = sWaveOuts.find(hwo); if (found_it != sWaveOuts.end()) { @@ -162,10 +162,11 @@ extern "C" // the captain has turned off the MMX sign, you are now free to use floating point registers _mm_empty(); + // finish remaining samples that didn't fit into 64 bit register for (short* sample_16 = (short*)sample_64; sample_16 < (short*)(pwh->lpData + pwh->dwBufferLength); ++sample_16) - { // finish remaining samples that didn't fit into 64 bit register + { *sample_16 = (*sample_16 * volume_16) >> 15; } -- cgit v1.2.3 From fe1413c2e52e7ba42f49aff3cadf8cf65c13278b Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 28 Apr 2010 18:27:44 -0700 Subject: package step now depends on package contents...so changing llplugin.exe or theplugins dlls will result in a new packaged viewer reviewed by Mani --- indra/newview/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 835a9aacd5..a1e3b679ee 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1588,7 +1588,10 @@ if (WINDOWS) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat - DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS + ${VIEWER_BINARY_NAME} + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + ${COPY_INPUT_DEPENDENCIES} ) add_custom_target(package ALL DEPENDS -- cgit v1.2.3 From a1b765189d4b8bfb6ec99bc5e5c0a2cc4c9ccbd2 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 28 Apr 2010 19:06:08 -0700 Subject: fix for media not working in release builds reviewed by Mani --- indra/media_plugins/webkit/windows_volume_catcher.cpp | 11 ++++------- indra/newview/skins/default/xui/en/panel_login.xml | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp index fdff28c2c1..ef96102a0a 100644 --- a/indra/media_plugins/webkit/windows_volume_catcher.cpp +++ b/indra/media_plugins/webkit/windows_volume_catcher.cpp @@ -34,7 +34,6 @@ #include "volume_catcher.h" #include #include "llsingleton.h" - class VolumeCatcherImpl : public LLSingleton { friend LLSingleton; @@ -48,8 +47,8 @@ private: VolumeCatcherImpl(); ~VolumeCatcherImpl(); - typedef void (*set_volume_func_t)(F32); - typedef void (*set_mute_func_t)(bool); + typedef void (WINAPI *set_volume_func_t)(F32); + typedef void (WINAPI *set_mute_func_t)(bool); set_volume_func_t mSetVolumeFunc; set_mute_func_t mSetMuteFunc; @@ -57,7 +56,6 @@ private: F32 mVolume; F32 mPan; }; - VolumeCatcherImpl::VolumeCatcherImpl() : mVolume(1.0f), // default volume is max mPan(0.f) // default pan is centered @@ -77,10 +75,8 @@ VolumeCatcherImpl::~VolumeCatcherImpl() void VolumeCatcherImpl::setVolume(F32 volume) { - //F32 left_volume = volume * min(1.f, 1.f - mPan); - //F32 right_volume = volume * max(0.f, 1.f + mPan); - mVolume = volume; + if (mSetMuteFunc) { mSetMuteFunc(volume == 0.f); @@ -123,3 +119,4 @@ void VolumeCatcher::pump() // No periodic tasks are necessary for this implementation. } + diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a725548e61..20bf618b64 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -13,7 +13,7 @@ top="600" - http://secondlife.com/app/login/ + http://www.yahoo.com/ http://secondlife.eniac15.lindenlab.com/reg-in-client/ -- cgit v1.2.3 From 34e29fe71277609e6c18c967b8fd7a45116d4d82 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 29 Apr 2010 12:24:46 -0600 Subject: add debug code for EXT-7011: crash at LLPluginClassMedia::idle [secondlife-bin llpluginclassmedia.cpp:158] --- indra/llplugin/llpluginclassmedia.cpp | 4 ++++ indra/llplugin/llpluginclassmedia.h | 8 ++++++++ indra/newview/llviewermedia.cpp | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 0c9b325b68..41ace62964 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -57,11 +57,15 @@ LLPluginClassMedia::LLPluginClassMedia(LLPluginClassMediaOwner *owner) mOwner = owner; mPlugin = NULL; reset(); + + //debug use + mDeleteOK = true ; } LLPluginClassMedia::~LLPluginClassMedia() { + llassert_always(mDeleteOK) ; reset(); } diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 8c7b00f45b..66853c9940 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -373,6 +373,14 @@ protected: F64 mCurrentRate; F64 mLoadedDuration; +//-------------------------------------- + //debug use only + // +private: + bool mDeleteOK ; +public: + void setDeleteOK(bool flag) { mDeleteOK = flag ;} +//-------------------------------------- }; #endif // LL_LLPLUGINCLASSMEDIA_H diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index fd2bb0fdf9..480d4e9e69 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1578,6 +1578,7 @@ void LLViewerMediaImpl::destroyMediaSource() if(mMediaSource) { + mMediaSource->setDeleteOK(true) ; delete mMediaSource; mMediaSource = NULL; } @@ -1729,7 +1730,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) } mMediaSource = media_source; - + mMediaSource->setDeleteOK(false) ; updateVolume(); return true; -- cgit v1.2.3 From bb01c0462497977d6a122a93643722d9a589cbaa Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 30 Apr 2010 12:56:44 -0600 Subject: trival: remove extra llpushcallstacks, which is for debug only. --- indra/newview/llappviewer.cpp | 8 +------- indra/newview/llviewerdisplay.cpp | 1 - indra/newview/pipeline.cpp | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2f9bbb1407..5af6f1778e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3951,8 +3951,7 @@ void LLAppViewer::idleNetwork() LLMemType mt_in(LLMemType::MTYPE_IDLE_NETWORK); pingMainloopTimeout("idleNetwork"); LLError::LLCallStacks::clear() ; - llpushcallstacks ; - + gObjectList.mNumNewObjects = 0; S32 total_decoded = 0; @@ -3962,7 +3961,6 @@ void LLAppViewer::idleNetwork() // deal with any queued name requests and replies. gCacheName->processPending(); - llpushcallstacks ; LLTimer check_message_timer; // Read all available packets from network const S64 frame_count = gFrameCount; // U32->S64 @@ -4032,16 +4030,13 @@ void LLAppViewer::idleNetwork() gPrintMessagesThisFrame = FALSE; } } - llpushcallstacks ; LLViewerStats::getInstance()->mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects); // Retransmit unacknowledged packets. gXferManager->retransmitUnackedPackets(); gAssetStorage->checkForTimeouts(); - llpushcallstacks ; gViewerThrottle.updateDynamicThrottle(); - llpushcallstacks ; // Check that the circuit between the viewer and the agent's current // region is still alive LLViewerRegion *agent_region = gAgent.getRegion(); @@ -4057,7 +4052,6 @@ void LLAppViewer::idleNetwork() mAgentRegionLastID = this_region_id; mAgentRegionLastAlive = this_region_alive; } - llpushcallstacks ; } void LLAppViewer::disconnectViewer() diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 823466e33e..f0800e82e7 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -169,7 +169,6 @@ void display_startup() void display_update_camera() { LLMemType mt_uc(LLMemType::MTYPE_DISPLAY_UPDATE_CAMERA); - llpushcallstacks ; // TODO: cut draw distance down if customizing avatar? // TODO: cut draw distance on per-parcel basis? diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 36daca174b..731f5d40be 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1799,7 +1799,6 @@ void LLPipeline::rebuildPriorityGroups() void LLPipeline::rebuildGroups() { - llpushcallstacks ; // Iterate through some drawables on the non-priority build queue S32 size = (S32) mGroupQ2.size(); S32 min_count = llclamp((S32) ((F32) (size * size)/4096*0.25f), 1, size); @@ -2963,7 +2962,6 @@ U32 LLPipeline::sCurRenderPoolType = 0 ; void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) { - llpushcallstacks ; LLMemType mt(LLMemType::MTYPE_PIPELINE_RENDER_GEOM); LLFastTimer t(FTM_RENDER_GEOMETRY); @@ -7839,7 +7837,6 @@ void LLPipeline::renderHighlight(const LLViewerObject* obj, F32 fade) void LLPipeline::generateHighlight(LLCamera& camera) { //render highlighted object as white into offscreen render target - llpushcallstacks ; if (mHighlightObject.notNull()) { mHighlightSet.insert(HighlightItem(mHighlightObject)); -- cgit v1.2.3 From 10b073413548db34ec4c6c6f6976414cd97f9954 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Fri, 30 Apr 2010 12:59:53 -0700 Subject: Bumped version to 2.0.2.0 - just in case --- indra/llcommon/llversionviewer.h | 4 ++-- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- indra/newview/Info-SecondLife.plist | 2 +- indra/newview/res/viewerRes.rc | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index fc9fcb2d9e..fc3ce6df7e 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,8 +35,8 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 0; -const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 203110; +const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 02c3dfc6e0..4831dc7273 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -2,6 +2,6 @@ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 2.0.0.203110"; -CFBundleGetInfoString = "Second Life version 2.0.0.203110, Copyright 2004-2009 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 2.0.2.0"; +CFBundleGetInfoString = "Second Life version 2.0.2.0, Copyright 2004-2009 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 4cb01a0f33..a7241cac89 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 2.0.0.203110 + 2.0.2.0 CSResourcesFileMapped diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 12a09392f6..731953f9bb 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -129,8 +129,8 @@ TOOLSIT CURSOR "toolsit.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,203110 - PRODUCTVERSION 2,0,0,203110 + FILEVERSION 2,0,2,0 + PRODUCTVERSION 2,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -147,12 +147,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.203110" + VALUE "FileVersion", "2.0.2.0" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.203110" + VALUE "ProductVersion", "2.0.2.0" END END BLOCK "VarFileInfo" -- cgit v1.2.3 From e2e31b1b6b049adbdf16d6078827239c135be49f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 30 Apr 2010 13:26:25 -0700 Subject: Added min and max for media sound attenuation reviewed by Richard --- indra/newview/llviewermedia.cpp | 28 +++++++++++++++++++++++----- indra/newview/llviewermedia.h | 1 + 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index fd2bb0fdf9..c8f3374f38 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -33,6 +33,7 @@ #include "llviewerprecompiledheaders.h" #include "llagent.h" +#include "llagentcamera.h" #include "llviewermedia.h" #include "llviewermediafocus.h" #include "llmimetypes.h" @@ -1914,15 +1915,29 @@ void LLViewerMediaImpl::updateVolume() { if(mMediaSource) { - F32 attenuation_multiplier = 1.0; + // always scale the volume by the global media volume + F32 volume = mRequestedVolume * LLViewerMedia::getVolume(); - if (mProximityDistance > 0) + // attenuate if this is not parcel media + if (!mIsParcelMedia) { - // the attenuation multiplier should never be more than one since that would increase volume - attenuation_multiplier = llmin(1.0, gSavedSettings.getF32("MediaRollOffFactor")/mProximityDistance); + if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMaxDistance")) + { + volume = 0; + } + else + { + // attenuated volume = volume * roll_off rate / distance^2 + // adjust distance by saved setting so we can tune the distance at which attenuation begins + // the actual start distance is sqrt(MediaRollOffMaxDistance)+MediaRollOffStartAdjustment + F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffStart"); + + // the attenuation multiplier should never be more than one since that would increase volume + volume = volume * llmin(1.0, gSavedSettings.getF32("MediaRollOffRate")/adjusted_distance*adjusted_distance); + } } - mMediaSource->setVolume(mRequestedVolume * LLViewerMedia::getVolume() * attenuation_multiplier); + mMediaSource->setVolume(volume); } } @@ -3009,6 +3024,9 @@ void LLViewerMediaImpl::calculateInterest() LLVector3d agent_global = gAgent.getPositionGlobal() ; LLVector3d global_delta = agent_global - obj_global ; mProximityDistance = global_delta.magVecSquared(); // use distance-squared because it's cheaper and sorts the same. + + LLVector3d camera_delta = gAgentCamera.getCameraPositionGlobal() - obj_global; + mProximityCamera = camera_delta.magVec(); } if(mNeedsMuteCheck) diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index e829d7a5b4..8626f4469e 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -431,6 +431,7 @@ private: bool mIsParcelMedia; S32 mProximity; F64 mProximityDistance; + F64 mProximityCamera; LLMimeDiscoveryResponder *mMimeTypeProbe; bool mMediaAutoPlay; std::string mMediaEntryURL; -- cgit v1.2.3 From 32be2a798bb90825710f5029388a7f2c3197b872 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 30 Apr 2010 15:42:48 -0600 Subject: for EXT-7181: create a cheaper call stack tracing tool. --- indra/llcommon/llerror.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index bd334a6654..41ff5849f4 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1225,17 +1225,32 @@ namespace LLError char** LLCallStacks::sBuffer = NULL ; S32 LLCallStacks::sIndex = 0 ; +#define SINGLE_THREADED 1 + class CallStacksLogLock { public: CallStacksLogLock(); ~CallStacksLogLock(); + +#if SINGLE_THREADED + bool ok() const { return true; } +#else bool ok() const { return mOK; } private: bool mLocked; bool mOK; +#endif }; +#if SINGLE_THREADED + CallStacksLogLock::CallStacksLogLock() + { + } + CallStacksLogLock::~CallStacksLogLock() + { + } +#else CallStacksLogLock::CallStacksLogLock() : mLocked(false), mOK(false) { @@ -1271,6 +1286,7 @@ namespace LLError apr_thread_mutex_unlock(gCallStacksLogMutexp); } } +#endif //static void LLCallStacks::push(const char* function, const int line) -- cgit v1.2.3 From 07c207346f63d464e45efe0be3aae64138982279 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 30 Apr 2010 15:59:59 -0700 Subject: updated media attenuation function reviewed by Richard --- indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++-- indra/newview/llviewermedia.cpp | 19 +++++++++---------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6f11a6d616..266ed2b5fd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5838,7 +5838,7 @@ Value 1.0 - MediaRollOffFactor + MediaRollOffRate Comment Multiplier to change rate of media attenuation @@ -5847,7 +5847,29 @@ Type F32 Value - 10.0 + 0.2 + + MediaRollOffMin + + Comment + Adjusts the distance at which media attentuation starts + Persist + 1 + Type + F32 + Value + 7.0 + + MediaRollOffMax + + Comment + Distance at which media volume is set to 0 + Persist + 1 + Type + F32 + Value + 30.0 RecentItemsSortOrder diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index c8f3374f38..076a9609e3 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1918,22 +1918,21 @@ void LLViewerMediaImpl::updateVolume() // always scale the volume by the global media volume F32 volume = mRequestedVolume * LLViewerMedia::getVolume(); - // attenuate if this is not parcel media - if (!mIsParcelMedia) + if (mProximityCamera > 0) { - if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMaxDistance")) + if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMax")) { volume = 0; } - else + else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin")) { - // attenuated volume = volume * roll_off rate / distance^2 - // adjust distance by saved setting so we can tune the distance at which attenuation begins - // the actual start distance is sqrt(MediaRollOffMaxDistance)+MediaRollOffStartAdjustment - F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffStart"); - + // attenuated_volume = v / ( 1 + (roll_off_rate * (d - min))^2 + // the +1 is there so that for distance 0 the volume stays the same + F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin"); + F64 attenuation = gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance; + attenuation = attenuation * attenuation; // the attenuation multiplier should never be more than one since that would increase volume - volume = volume * llmin(1.0, gSavedSettings.getF32("MediaRollOffRate")/adjusted_distance*adjusted_distance); + volume = volume * llmin(1.0, 1 /(attenuation + 1)); } } -- cgit v1.2.3 From 66a445298e2991cbfd29affa445c76b56b8631d5 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 30 Apr 2010 17:28:09 -0600 Subject: the second round debug code for EXT-6792: Crash on ATI 3200 --- indra/newview/llappviewer.cpp | 1 - indra/newview/pipeline.cpp | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5af6f1778e..858c889939 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3950,7 +3950,6 @@ void LLAppViewer::idleNetwork() { LLMemType mt_in(LLMemType::MTYPE_IDLE_NETWORK); pingMainloopTimeout("idleNetwork"); - LLError::LLCallStacks::clear() ; gObjectList.mNumNewObjects = 0; S32 total_decoded = 0; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 731f5d40be..2d2fc38573 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2200,7 +2200,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) //LLVertexBuffer::unbind(); grabReferences(result); - + llpushcallstacks ; for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter) { LLSpatialGroup* group = *iter; @@ -2218,7 +2218,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } } } - + llpushcallstacks ; for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter) { LLSpatialGroup* group = *iter; @@ -2234,7 +2234,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } } - + llpushcallstacks ; if (LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD) { for (LLCullResult::bridge_list_t::iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i) @@ -2248,7 +2248,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } } } - + llpushcallstacks ; { LLFastTimer ftm(FTM_STATESORT_DRAWABLE); for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList(); @@ -2268,6 +2268,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } postSort(camera); + llpushcallstacks ; } void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera) @@ -7100,8 +7101,7 @@ inline float sgn(float a) } void LLPipeline::generateWaterReflection(LLCamera& camera_in) -{ - llpushcallstacks ; +{ if (LLPipeline::sWaterReflections && assertInitialized() && LLDrawPoolWater::sNeedsReflectionUpdate) { BOOL skip_avatar_update = FALSE; @@ -7110,6 +7110,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) skip_avatar_update = TRUE; } + llpushcallstacks ; if (!skip_avatar_update) { gAgentAvatarp->updateAttachmentVisibility(CAMERA_MODE_THIRD_PERSON); @@ -7197,7 +7198,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) glCullFace(GL_FRONT); - static LLCullResult ref_result; U32 ref_mask = 0; if (LLDrawPoolWater::sNeedsDistortionUpdate) @@ -7209,6 +7209,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) (1 << LLPipeline::RENDER_TYPE_WL_SKY)); static LLCullResult result; updateCull(camera, result); + llpushcallstacks ; stateSort(camera, result); mRenderTypeMask = tmp & ((1 << LLPipeline::RENDER_TYPE_SKY) | (1 << LLPipeline::RENDER_TYPE_CLOUDS) | @@ -7243,13 +7244,13 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) LLGLUserClipPlane clip_plane(plane, mat, projection); LLGLDisable cull(GL_CULL_FACE); updateCull(camera, ref_result, 1); + llpushcallstacks ; stateSort(camera, ref_result); } ref_mask = mRenderTypeMask; mRenderTypeMask = mask; } - if (LLDrawPoolWater::sNeedsDistortionUpdate) { mRenderTypeMask = ref_mask; @@ -7267,7 +7268,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) } camera.setOrigin(camera_in.getOrigin()); - //render distortion map static BOOL last_update = TRUE; if (last_update) @@ -7301,6 +7301,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) LLGLUserClipPlane clip_plane(LLPlane(-pnorm, -(pd+pad)), mat, projection); static LLCullResult result; updateCull(camera, result, water_clip); + llpushcallstacks ; stateSort(camera, result); gGL.setColorMask(true, true); @@ -7324,7 +7325,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) glClear(GL_DEPTH_BUFFER_BIT); } glClearColor(0.f, 0.f, 0.f, 0.f); - gViewerWindow->setup3DViewport(); mRenderTypeMask = type_mask; LLDrawPoolWater::sNeedsReflectionUpdate = FALSE; @@ -7340,6 +7340,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) { gAgentAvatarp->updateAttachmentVisibility(gAgentCamera.getCameraMode()); } + llpushcallstacks ; } } -- cgit v1.2.3 From a0a86355893404135286ab33a1241f65e2de6388 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 30 Apr 2010 17:43:07 -0700 Subject: Viewer 2.1 set10 translation for DE, JA, FR, PT, IT, ES --- .../newview/skins/default/xui/de/floater_about.xml | 7 +- .../default/xui/de/floater_animation_preview.xml | 48 ++++++------ .../default/xui/de/floater_day_cycle_options.xml | 28 ++++--- .../skins/default/xui/de/floater_god_tools.xml | 13 ++-- .../skins/default/xui/de/floater_image_preview.xml | 20 ++--- .../skins/default/xui/de/floater_outgoing_call.xml | 2 +- .../skins/default/xui/de/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/de/floater_tos.xml | 19 ++--- .../skins/default/xui/de/menu_attachment_other.xml | 2 +- .../skins/default/xui/de/menu_attachment_self.xml | 1 + .../skins/default/xui/de/menu_avatar_other.xml | 2 +- .../skins/default/xui/de/menu_avatar_self.xml | 1 + .../default/xui/de/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/de/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/de/menu_inventory.xml | 3 +- indra/newview/skins/default/xui/de/menu_login.xml | 14 +--- .../skins/default/xui/de/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/de/menu_viewer.xml | 14 +--- .../newview/skins/default/xui/de/notifications.xml | 52 +++++++++---- .../skins/default/xui/de/panel_edit_eyes.xml | 8 +- .../skins/default/xui/de/panel_edit_gloves.xml | 8 +- .../skins/default/xui/de/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/de/panel_edit_jacket.xml | 8 +- .../skins/default/xui/de/panel_edit_pants.xml | 8 +- .../skins/default/xui/de/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/de/panel_edit_shirt.xml | 8 +- .../skins/default/xui/de/panel_edit_shoes.xml | 8 +- .../skins/default/xui/de/panel_edit_skin.xml | 14 ++-- .../skins/default/xui/de/panel_edit_skirt.xml | 8 +- .../skins/default/xui/de/panel_edit_socks.xml | 8 +- .../skins/default/xui/de/panel_edit_underpants.xml | 8 +- .../skins/default/xui/de/panel_edit_undershirt.xml | 8 +- .../skins/default/xui/de/panel_edit_wearable.xml | 5 ++ .../skins/default/xui/de/panel_group_general.xml | 5 +- .../xui/de/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/de/panel_nearby_media.xml | 14 ++-- .../default/xui/de/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/de/panel_people.xml | 21 +++-- .../newview/skins/default/xui/de/panel_places.xml | 1 + .../default/xui/de/panel_preferences_advanced.xml | 4 + .../skins/default/xui/de/panel_world_map.xml | 6 ++ .../skins/default/xui/de/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/de/strings.xml | 48 ++++++++++-- .../newview/skins/default/xui/es/floater_about.xml | 11 +-- .../default/xui/es/floater_animation_preview.xml | 48 ++++++------ .../skins/default/xui/es/floater_god_tools.xml | 9 +-- .../skins/default/xui/es/floater_image_preview.xml | 20 ++--- .../skins/default/xui/es/floater_outgoing_call.xml | 2 +- .../skins/default/xui/es/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/es/floater_tos.xml | 12 +-- .../skins/default/xui/es/menu_attachment_other.xml | 2 +- .../skins/default/xui/es/menu_attachment_self.xml | 1 + .../skins/default/xui/es/menu_avatar_other.xml | 2 +- .../skins/default/xui/es/menu_avatar_self.xml | 1 + .../default/xui/es/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/es/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/es/menu_inventory.xml | 1 + indra/newview/skins/default/xui/es/menu_login.xml | 14 +--- .../skins/default/xui/es/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/es/menu_viewer.xml | 16 +--- .../newview/skins/default/xui/es/notifications.xml | 44 +++++++++-- .../skins/default/xui/es/panel_edit_eyes.xml | 8 +- .../skins/default/xui/es/panel_edit_gloves.xml | 8 +- .../skins/default/xui/es/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/es/panel_edit_jacket.xml | 8 +- .../skins/default/xui/es/panel_edit_pants.xml | 8 +- .../skins/default/xui/es/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/es/panel_edit_shirt.xml | 8 +- .../skins/default/xui/es/panel_edit_shoes.xml | 8 +- .../skins/default/xui/es/panel_edit_skin.xml | 14 ++-- .../skins/default/xui/es/panel_edit_skirt.xml | 8 +- .../skins/default/xui/es/panel_edit_socks.xml | 8 +- .../skins/default/xui/es/panel_edit_underpants.xml | 8 +- .../skins/default/xui/es/panel_edit_undershirt.xml | 8 +- .../skins/default/xui/es/panel_edit_wearable.xml | 5 ++ .../skins/default/xui/es/panel_group_general.xml | 5 +- .../xui/es/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/es/panel_nearby_media.xml | 20 +++-- .../default/xui/es/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/es/panel_people.xml | 21 +++-- .../newview/skins/default/xui/es/panel_places.xml | 1 + .../default/xui/es/panel_preferences_advanced.xml | 4 + .../skins/default/xui/es/panel_world_map.xml | 6 ++ .../skins/default/xui/es/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/es/strings.xml | 45 ++++++++++- .../newview/skins/default/xui/fr/floater_about.xml | 7 +- .../default/xui/fr/floater_animation_preview.xml | 48 ++++++------ .../default/xui/fr/floater_day_cycle_options.xml | 23 +++--- .../skins/default/xui/fr/floater_god_tools.xml | 9 +-- .../skins/default/xui/fr/floater_image_preview.xml | 20 ++--- .../skins/default/xui/fr/floater_outgoing_call.xml | 2 +- .../skins/default/xui/fr/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/fr/floater_tos.xml | 19 ++--- .../skins/default/xui/fr/menu_attachment_other.xml | 2 +- .../skins/default/xui/fr/menu_attachment_self.xml | 1 + .../skins/default/xui/fr/menu_avatar_other.xml | 2 +- .../skins/default/xui/fr/menu_avatar_self.xml | 1 + .../default/xui/fr/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/fr/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/fr/menu_inventory.xml | 3 +- indra/newview/skins/default/xui/fr/menu_login.xml | 14 +--- .../skins/default/xui/fr/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 14 +--- .../newview/skins/default/xui/fr/notifications.xml | 52 +++++++++---- .../skins/default/xui/fr/panel_edit_eyes.xml | 8 +- .../skins/default/xui/fr/panel_edit_gloves.xml | 10 ++- .../skins/default/xui/fr/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/fr/panel_edit_jacket.xml | 10 ++- .../skins/default/xui/fr/panel_edit_pants.xml | 10 ++- .../skins/default/xui/fr/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/fr/panel_edit_shirt.xml | 10 ++- .../skins/default/xui/fr/panel_edit_shoes.xml | 10 ++- .../skins/default/xui/fr/panel_edit_skin.xml | 18 +++-- .../skins/default/xui/fr/panel_edit_skirt.xml | 10 ++- .../skins/default/xui/fr/panel_edit_socks.xml | 10 ++- .../skins/default/xui/fr/panel_edit_underpants.xml | 10 ++- .../skins/default/xui/fr/panel_edit_undershirt.xml | 10 ++- .../skins/default/xui/fr/panel_edit_wearable.xml | 7 +- .../skins/default/xui/fr/panel_group_general.xml | 5 +- .../xui/fr/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/fr/panel_nearby_media.xml | 16 ++-- .../default/xui/fr/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/fr/panel_people.xml | 21 +++-- .../newview/skins/default/xui/fr/panel_places.xml | 1 + .../default/xui/fr/panel_preferences_advanced.xml | 4 + .../skins/default/xui/fr/panel_world_map.xml | 6 ++ .../skins/default/xui/fr/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/fr/strings.xml | 45 ++++++++++- .../newview/skins/default/xui/it/floater_about.xml | 11 +-- .../default/xui/it/floater_animation_preview.xml | 48 ++++++------ .../skins/default/xui/it/floater_god_tools.xml | 12 ++- .../skins/default/xui/it/floater_image_preview.xml | 20 ++--- .../skins/default/xui/it/floater_outgoing_call.xml | 2 +- .../skins/default/xui/it/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/it/floater_tos.xml | 12 +-- .../skins/default/xui/it/menu_attachment_other.xml | 2 +- .../skins/default/xui/it/menu_attachment_self.xml | 1 + .../skins/default/xui/it/menu_avatar_other.xml | 2 +- .../skins/default/xui/it/menu_avatar_self.xml | 1 + .../default/xui/it/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/it/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/it/menu_inventory.xml | 1 + indra/newview/skins/default/xui/it/menu_login.xml | 14 +--- .../skins/default/xui/it/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/it/menu_viewer.xml | 14 +--- .../newview/skins/default/xui/it/notifications.xml | 44 +++++++++-- .../skins/default/xui/it/panel_edit_eyes.xml | 8 +- .../skins/default/xui/it/panel_edit_gloves.xml | 8 +- .../skins/default/xui/it/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/it/panel_edit_jacket.xml | 8 +- .../skins/default/xui/it/panel_edit_pants.xml | 8 +- .../skins/default/xui/it/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/it/panel_edit_shirt.xml | 8 +- .../skins/default/xui/it/panel_edit_shoes.xml | 8 +- .../skins/default/xui/it/panel_edit_skin.xml | 14 ++-- .../skins/default/xui/it/panel_edit_skirt.xml | 8 +- .../skins/default/xui/it/panel_edit_socks.xml | 8 +- .../skins/default/xui/it/panel_edit_underpants.xml | 8 +- .../skins/default/xui/it/panel_edit_undershirt.xml | 8 +- .../skins/default/xui/it/panel_edit_wearable.xml | 5 ++ .../skins/default/xui/it/panel_group_general.xml | 5 +- .../default/xui/it/panel_im_control_panel.xml | 2 +- .../xui/it/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/it/panel_nearby_media.xml | 16 ++-- .../default/xui/it/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/it/panel_people.xml | 21 +++-- .../newview/skins/default/xui/it/panel_places.xml | 1 + .../default/xui/it/panel_preferences_advanced.xml | 4 + .../skins/default/xui/it/panel_world_map.xml | 6 ++ .../skins/default/xui/it/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/it/strings.xml | 45 ++++++++++- .../newview/skins/default/xui/ja/floater_about.xml | 7 +- .../default/xui/ja/floater_animation_preview.xml | 48 ++++++------ .../default/xui/ja/floater_day_cycle_options.xml | 33 ++++---- .../skins/default/xui/ja/floater_god_tools.xml | 9 +-- .../skins/default/xui/ja/floater_image_preview.xml | 20 ++--- .../skins/default/xui/ja/floater_outgoing_call.xml | 2 +- .../skins/default/xui/ja/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/ja/floater_tos.xml | 19 ++--- .../skins/default/xui/ja/menu_attachment_other.xml | 2 +- .../skins/default/xui/ja/menu_attachment_self.xml | 1 + .../skins/default/xui/ja/menu_avatar_other.xml | 2 +- .../skins/default/xui/ja/menu_avatar_self.xml | 1 + .../default/xui/ja/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/ja/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/ja/menu_inventory.xml | 3 +- indra/newview/skins/default/xui/ja/menu_login.xml | 14 +--- .../skins/default/xui/ja/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/ja/menu_viewer.xml | 14 +--- .../newview/skins/default/xui/ja/notifications.xml | 53 +++++++++---- .../skins/default/xui/ja/panel_edit_eyes.xml | 8 +- .../skins/default/xui/ja/panel_edit_gloves.xml | 8 +- .../skins/default/xui/ja/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/ja/panel_edit_jacket.xml | 8 +- .../skins/default/xui/ja/panel_edit_pants.xml | 8 +- .../skins/default/xui/ja/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/ja/panel_edit_shirt.xml | 8 +- .../skins/default/xui/ja/panel_edit_shoes.xml | 8 +- .../skins/default/xui/ja/panel_edit_skin.xml | 14 ++-- .../skins/default/xui/ja/panel_edit_skirt.xml | 8 +- .../skins/default/xui/ja/panel_edit_socks.xml | 8 +- .../skins/default/xui/ja/panel_edit_underpants.xml | 8 +- .../skins/default/xui/ja/panel_edit_undershirt.xml | 8 +- .../skins/default/xui/ja/panel_edit_wearable.xml | 5 ++ .../skins/default/xui/ja/panel_group_general.xml | 5 +- .../xui/ja/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/ja/panel_nearby_media.xml | 14 ++-- .../default/xui/ja/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/ja/panel_people.xml | 21 +++-- .../newview/skins/default/xui/ja/panel_places.xml | 1 + .../default/xui/ja/panel_preferences_advanced.xml | 4 + .../skins/default/xui/ja/panel_world_map.xml | 6 ++ .../skins/default/xui/ja/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/ja/strings.xml | 48 ++++++++++-- .../newview/skins/default/xui/pt/floater_about.xml | 9 +-- .../default/xui/pt/floater_animation_preview.xml | 48 ++++++------ .../default/xui/pt/floater_day_cycle_options.xml | 2 +- .../skins/default/xui/pt/floater_god_tools.xml | 9 +-- .../skins/default/xui/pt/floater_image_preview.xml | 20 ++--- .../skins/default/xui/pt/floater_outgoing_call.xml | 2 +- .../skins/default/xui/pt/floater_snapshot.xml | 89 ++++------------------ indra/newview/skins/default/xui/pt/floater_tos.xml | 12 +-- .../skins/default/xui/pt/menu_attachment_other.xml | 2 +- .../skins/default/xui/pt/menu_attachment_self.xml | 1 + .../skins/default/xui/pt/menu_avatar_other.xml | 2 +- .../skins/default/xui/pt/menu_avatar_self.xml | 1 + .../default/xui/pt/menu_inspect_avatar_gear.xml | 2 +- .../default/xui/pt/menu_inspect_self_gear.xml | 1 + .../skins/default/xui/pt/menu_inventory.xml | 1 + indra/newview/skins/default/xui/pt/menu_login.xml | 14 +--- .../skins/default/xui/pt/menu_participant_list.xml | 1 + indra/newview/skins/default/xui/pt/menu_viewer.xml | 14 +--- .../newview/skins/default/xui/pt/notifications.xml | 44 +++++++++-- .../skins/default/xui/pt/panel_edit_eyes.xml | 8 +- .../skins/default/xui/pt/panel_edit_gloves.xml | 8 +- .../skins/default/xui/pt/panel_edit_hair.xml | 14 ++-- .../skins/default/xui/pt/panel_edit_jacket.xml | 8 +- .../skins/default/xui/pt/panel_edit_pants.xml | 8 +- .../skins/default/xui/pt/panel_edit_shape.xml | 24 +++--- .../skins/default/xui/pt/panel_edit_shirt.xml | 8 +- .../skins/default/xui/pt/panel_edit_shoes.xml | 8 +- .../skins/default/xui/pt/panel_edit_skin.xml | 14 ++-- .../skins/default/xui/pt/panel_edit_skirt.xml | 8 +- .../skins/default/xui/pt/panel_edit_socks.xml | 8 +- .../skins/default/xui/pt/panel_edit_underpants.xml | 8 +- .../skins/default/xui/pt/panel_edit_undershirt.xml | 8 +- .../skins/default/xui/pt/panel_edit_wearable.xml | 5 ++ .../skins/default/xui/pt/panel_group_general.xml | 5 +- .../default/xui/pt/panel_im_control_panel.xml | 2 +- .../xui/pt/panel_media_settings_permissions.xml | 9 +++ .../skins/default/xui/pt/panel_nearby_media.xml | 14 ++-- .../default/xui/pt/panel_outfits_inventory.xml | 4 +- .../newview/skins/default/xui/pt/panel_people.xml | 21 +++-- .../newview/skins/default/xui/pt/panel_places.xml | 1 + .../default/xui/pt/panel_preferences_advanced.xml | 4 + .../skins/default/xui/pt/panel_world_map.xml | 6 ++ .../skins/default/xui/pt/sidepanel_inventory.xml | 1 + indra/newview/skins/default/xui/pt/strings.xml | 45 ++++++++++- 258 files changed, 1775 insertions(+), 1528 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index c19f98516d..89f9f87043 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -43,13 +43,14 @@ Vivox-Version: [VIVOX_VERSION] - Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl und vielen anderen. + Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain und vielen anderen. -Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar +Wir bedanken uns bei folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan und vielen anderen. -Um im Geschäftsleben erfolreich zu sein, sei kühn, sei schnell, sei anders. --Henry Marchant + +„Die Arbeit beginnt aufs Neue, die Hoffnung lebt weiter, und der Traum wird niemals sterben.“ - Edward Kennedy diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml index 0d55ea7413..82a4a51d07 100644 --- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml @@ -142,35 +142,35 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden. Ausdruck - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Vorschau während: - - - - + + + + diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml index 837dfa9e8c..8599737106 100644 --- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml @@ -1,8 +1,8 @@ - + -