From 10fe67f4a6f167d2f3a3f56551a56da3f8c5b5aa Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 15 Jul 2012 16:41:31 -0500 Subject: [PATCH 1/5] FBO tweaks. Release multisample fbo in LLPipeline::releaseScreenBuffers, and fixed LLRenderBuffer::mInternalFormat falling out of sync with LLRenderBuffer::mTex. --- indra/llrender/llrendertarget.cpp | 1 + indra/newview/pipeline.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 6ea20e977..ceb865ad1 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -793,6 +793,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt) } mTex.push_back(tex); + mInternalFormat.push_back(color_fmt); return true; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bd2424294..f71adc331 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -693,6 +693,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) } mSampleBuffer.release(); + mScreen.release(); if (LLPipeline::sRenderDeferred) { @@ -906,6 +907,8 @@ void LLPipeline::releaseScreenBuffers() { mShadow[i].release(); } + + mSampleBuffer.release(); } From 46f7250f087645eb6ea1a1f32213f21ba283dcc5 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 15 Jul 2012 21:12:31 -0500 Subject: [PATCH 2/5] Fixup multisample rbos. Samplecount validation all done in LLMultisampleBuffer::allocate, and falls back to non-multisample safely if multisampled rbos cannot/shouldn't be used. --- indra/llrender/llgl.cpp | 38 ++----------------------- indra/llrender/llgl.h | 5 ---- indra/llrender/llrendertarget.cpp | 44 +++++++++++++++++------------ indra/newview/llviewershadermgr.cpp | 2 +- indra/newview/pipeline.cpp | 7 ----- 5 files changed, 29 insertions(+), 67 deletions(-) diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 92d095b80..cf287f98c 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -435,11 +435,7 @@ LLGLManager::LLGLManager() : mHasPointParameters(FALSE), mHasDrawBuffers(FALSE), mHasTextureRectangle(FALSE), - mHasTextureMultisample(FALSE), mHasTransformFeedback(FALSE), - mMaxSampleMaskWords(0), - mMaxColorTextureSamples(0), - mMaxDepthTextureSamples(0), mMaxIntegerSamples(0), mHasAnisotropic(FALSE), @@ -732,12 +728,10 @@ bool LLGLManager::initGL() stop_glerror(); - if (mHasTextureMultisample) + if (mHasFramebufferMultisample) { - glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &mMaxColorTextureSamples); - glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &mMaxDepthTextureSamples); glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &mMaxIntegerSamples); - glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &mMaxSampleMaskWords); + glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples); } stop_glerror(); @@ -749,24 +743,12 @@ bool LLGLManager::initGL() } #endif stop_glerror(); - mHasTextureMultisample = FALSE; -#if LL_WINDOWS - if (mIsATI) - { //using multisample textures on ATI results in black screen for some reason - mHasTextureMultisample = FALSE; - } -#endif if (mIsIntel && mGLVersion <= 3.f) { //never try to use framebuffer objects on older intel drivers (crashy) mHasFramebufferObject = FALSE; } - if (mHasFramebufferObject) - { - glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples); - } - stop_glerror(); setToDebugGPU(); @@ -847,14 +829,6 @@ std::string LLGLManager::getRawGLString() return gl_string; } -U32 LLGLManager::getNumFBOFSAASamples(U32 samples) -{ - samples = llmin(samples, (U32) mMaxColorTextureSamples); - samples = llmin(samples, (U32) mMaxDepthTextureSamples); - samples = llmin(samples, (U32) 4); - return samples; -} - void LLGLManager::shutdownGL() { if (mInited) @@ -960,7 +934,6 @@ void LLGLManager::initExtensions() mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts); mHasBlendFuncSeparate = ExtensionExists("GL_EXT_blend_func_separate", gGLHExts.mSysExts); mHasTextureRectangle = ExtensionExists("GL_ARB_texture_rectangle", gGLHExts.mSysExts); - mHasTextureMultisample = ExtensionExists("GL_ARB_texture_multisample", gGLHExts.mSysExts); mHasDebugOutput = ExtensionExists("GL_ARB_debug_output", gGLHExts.mSysExts); mHasTransformFeedback = mGLVersion >= 4.f ? TRUE : FALSE; #if !LL_DARWIN @@ -1198,13 +1171,6 @@ void LLGLManager::initExtensions() { glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBlendFuncSeparateEXT"); } - if (mHasTextureMultisample) - { - glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC) GLH_EXT_GET_PROC_ADDRESS("glTexImage2DMultisample"); - glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC) GLH_EXT_GET_PROC_ADDRESS("glTexImage3DMultisample"); - glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC) GLH_EXT_GET_PROC_ADDRESS("glGetMultisamplefv"); - glSampleMaski = (PFNGLSAMPLEMASKIPROC) GLH_EXT_GET_PROC_ADDRESS("glSampleMaski"); - } if (mHasTransformFeedback) { glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC) GLH_EXT_GET_PROC_ADDRESS("glBeginTransformFeedback"); diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index c7e58aff9..f877834e9 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -104,11 +104,7 @@ public: BOOL mHasDrawBuffers; BOOL mHasDepthClamp; BOOL mHasTextureRectangle; - BOOL mHasTextureMultisample; BOOL mHasTransformFeedback; - S32 mMaxSampleMaskWords; - S32 mMaxColorTextureSamples; - S32 mMaxDepthTextureSamples; S32 mMaxIntegerSamples; // Other extensions. @@ -155,7 +151,6 @@ public: void printGLInfoString(); void getGLInfo(LLSD& info); - U32 getNumFBOFSAASamples(U32 desired_samples = 32); // In ALL CAPS std::string mGLVendor; std::string mGLVendorShort; diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index ceb865ad1..589c0dc0d 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -699,6 +699,28 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth release(); stop_glerror(); + if (!gGLManager.mHasFramebufferMultisample || !gGLManager.mHasFramebufferObject || !(sUseFBO || use_fbo)) + return false; + + if(color_fmt != GL_RGBA) + { + llwarns << "Unsupported color format: " << color_fmt << llendl; + return false; + } + + //Restrict to valid sample count + { + mSamples = samples; + mSamples = llmin(mSamples, (U32)4); //Cap to prevent memory bloat. + mSamples = llmin(mSamples, (U32) gGLManager.mMaxIntegerSamples);//GL_RGBA + + if(depth && !stencil) + mSamples = llmin(mSamples, (U32) gGLManager.mMaxSamples); //GL_DEPTH_COMPONENT16_ARB + } + + if (mSamples <= 1) + return false; + mResX = resx; mResY = resy; @@ -706,30 +728,16 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth mUseDepth = depth; mStencil = stencil; - if (!gGLManager.mHasFramebufferMultisample) - { - llerrs << "Attempting to allocate unsupported render target type!" << llendl; - return false; - } - - mSamples = gGLManager.getNumFBOFSAASamples(samples); - - if (mSamples <= 1) - { - llerrs << "Cannot create a multisample buffer with less than 2 samples." << llendl; - return false; - } - - stop_glerror(); - - if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject) { if (depth) { stop_glerror(); if(!allocateDepth()) + { + release(); return false; + } stop_glerror(); } glGenFramebuffers(1, (GLuint *) &mFBO); @@ -779,6 +787,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt) if (glGetError() != GL_NO_ERROR) { llwarns << "Unable to allocate color buffer for multisample render target." << llendl; + release(); return false; } @@ -793,7 +802,6 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt) } mTex.push_back(tex); - mInternalFormat.push_back(color_fmt); return true; } diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 0eb0b3cc2..6ab2cfd17 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -343,7 +343,7 @@ void LLViewerShaderMgr::setShaders() //setup preprocessor definitions LLShaderMgr::instance()->mDefinitions.clear(); - LLShaderMgr::instance()->mDefinitions["samples"] = llformat("%d", gSavedSettings.getU32("RenderFSAASamples")/*gGLManager.getNumFBOFSAASamples(gSavedSettings.getU32("RenderFSAASamples"))*/); + LLShaderMgr::instance()->mDefinitions["samples"] = llformat("%d", gSavedSettings.getU32("RenderFSAASamples")); LLShaderMgr::instance()->mDefinitions["NUM_TEX_UNITS"] = llformat("%d", gGLManager.mNumTextureImageUnits); initAttribsAndUniforms(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index f71adc331..27632dcfc 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -632,12 +632,6 @@ void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY) static const LLCachedControl RenderFSAASamples("RenderFSAASamples",0); U32 samples = RenderFSAASamples.get() - RenderFSAASamples.get() % 2; //Must be multipe of 2. - //Don't multisample if not using FXAA, or if fbos are disabled, or if multisampled fbos are not supported. - if(!LLPipeline::sRenderDeferred && (!LLRenderTarget::sUseFBO || !gGLManager.mHasFramebufferMultisample)) - { - samples = 0; - } - //try to allocate screen buffers at requested resolution and samples // - on failure, shrink number of samples and try again // - if not multisampled, shrink resolution and try again (favor X resolution over Y) @@ -791,7 +785,6 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) if (!mScreen.allocate(resX, resY, GL_RGBA, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false; if(samples > 1) { - if(mSampleBuffer.allocate(resX,resY,GL_RGBA,TRUE,TRUE,LLTexUnit::TT_RECT_TEXTURE,FALSE,samples)) mScreen.setSampleBuffer(&mSampleBuffer); else From 3cee90fe8b721bb88360ea1df9e763ab48ec7d3b Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 16 Jul 2012 01:00:55 -0500 Subject: [PATCH 3/5] Lets not call glDeleteTextures any more, since the glGenTextures/glDeleteTextures paradigm has gone away. --- indra/llrender/llimagegl.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 1e698adfc..6d7054e7e 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -330,7 +330,6 @@ S32 LLImageGL::updateBoundTexMem(const S32 mem, const S32 ncomponents, S32 categ //static void LLImageGL::destroyGL(BOOL save_state) { - deleteDeadTextures(); //Dump unimportant textures. for (S32 stage = 0; stage < gGLManager.mNumTextureUnits; stage++) { gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE); @@ -364,7 +363,6 @@ void LLImageGL::destroyGL(BOOL save_state) } llinfos << "Storing " << stored_count << " images..." << llendl; sAllowReadBackRaw = false ; - deleteDeadTextures();//Now, actually call glDeleteTextures for everything. } //static @@ -1528,7 +1526,7 @@ void LLImageGL::deleteDeadTextures() { bool reset = false; - for(U32 i=0;i Date: Mon, 16 Jul 2012 12:19:22 +0200 Subject: [PATCH 4/5] Version 1.7.0 --- indra/llcommon/llversionviewer.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llversionviewer.h.in b/indra/llcommon/llversionviewer.h.in index fe3f1012a..81b44887b 100644 --- a/indra/llcommon/llversionviewer.h.in +++ b/indra/llcommon/llversionviewer.h.in @@ -34,7 +34,7 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_MINOR = 7; const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = ${vBUILD}; From 84795863e5acddb85634d1ae6b5823ffcc2c74fd Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Mon, 16 Jul 2012 17:07:22 -0400 Subject: [PATCH 5/5] Translations updated Updated French Translation from Nomade's Zip for MultiWear. Updated Translations to use basically the same format, and not have some cruft. Abouts updated to include Spanish translators: Damian Zhaoying, and Franxizco Romano. --- .../skins/default/xui/en-us/floater_about.xml | 2 +- indra/newview/skins/default/xui/es/alerts.xml | 1 - .../skins/default/xui/es/floater_about.xml | 64 +- .../default/xui/es/floater_about_land.xml | 1159 ++- .../xui/es/floater_active_speakers.xml | 21 +- .../xui/es/floater_animation_preview.xml | 322 +- .../default/xui/es/floater_area_search.xml | 50 +- .../skins/default/xui/es/floater_auction.xml | 14 +- .../default/xui/es/floater_audio_volume.xml | 2 +- .../default/xui/es/floater_avatar_picker.xml | 90 +- .../xui/es/floater_avatar_textures.xml | 52 +- .../skins/default/xui/es/floater_beacons.xml | 31 +- .../default/xui/es/floater_build_options.xml | 14 +- .../default/xui/es/floater_bulk_perms.xml | 96 +- .../skins/default/xui/es/floater_bumps.xml | 37 +- .../default/xui/es/floater_buy_contents.xml | 42 +- .../default/xui/es/floater_buy_currency.xml | 130 +- .../skins/default/xui/es/floater_buy_land.xml | 481 +- .../default/xui/es/floater_buy_object.xml | 54 +- .../skins/default/xui/es/floater_camera.xml | 21 +- .../default/xui/es/floater_chat_history.xml | 184 +- .../default/xui/es/floater_chatterbox.xml | 7 +- .../default/xui/es/floater_choose_group.xml | 19 +- .../default/xui/es/floater_color_picker.xml | 71 +- .../skins/default/xui/es/floater_critical.xml | 18 +- .../default/xui/es/floater_customize.xml | 1237 ++-- .../xui/es/floater_day_cycle_options.xml | 208 +- .../xui/es/floater_device_settings.xml | 4 +- .../default/xui/es/floater_directory.xml | 861 ++- .../default/xui/es/floater_display_name.xml | 42 +- .../default/xui/es/floater_env_settings.xml | 46 +- .../skins/default/xui/es/floater_gesture.xml | 32 +- .../xui/es/floater_hardware_settings.xml | 86 +- .../skins/default/xui/es/floater_html.xml | 24 +- .../skins/default/xui/es/floater_im.xml | 86 +- .../default/xui/es/floater_image_preview.xml | 98 +- .../skins/default/xui/es/floater_inspect.xml | 28 +- .../xui/es/floater_instant_message.xml | 99 +- .../xui/es/floater_instant_message_ad_hoc.xml | 75 +- .../xui/es/floater_instant_message_group.xml | 91 +- .../es/floater_inventory_item_properties.xml | 170 +- .../xui/es/floater_inventory_view_finder.xml | 55 +- .../skins/default/xui/es/floater_joystick.xml | 205 +- .../skins/default/xui/es/floater_lagmeter.xml | 303 +- .../default/xui/es/floater_land_holdings.xml | 76 +- .../default/xui/es/floater_landmark_ctrl.xml | 16 +- .../default/xui/es/floater_live_lsleditor.xml | 21 +- .../default/xui/es/floater_lsl_guide.xml | 9 +- .../default/xui/es/floater_media_browser.xml | 60 +- .../default/xui/es/floater_mem_leaking.xml | 30 +- .../skins/default/xui/es/floater_mini_map.xml | 4 +- .../skins/default/xui/es/floater_moveview.xml | 30 +- .../default/xui/es/floater_mute_object.xml | 20 +- .../default/xui/es/floater_my_friends.xml | 8 +- .../xui/es/floater_name_description.xml | 20 +- .../skins/default/xui/es/floater_new_im.xml | 11 +- .../xui/es/floater_new_outfit_dialog.xml | 188 +- .../default/xui/es/floater_notification.xml | 13 +- .../xui/es/floater_notifications_console.xml | 10 +- .../default/xui/es/floater_object_im_info.xml | 34 +- .../default/xui/es/floater_openobject.xml | 11 +- .../skins/default/xui/es/floater_pay.xml | 47 +- .../default/xui/es/floater_pay_object.xml | 58 +- .../default/xui/es/floater_perm_prefs.xml | 30 +- .../skins/default/xui/es/panel_audio.xml | 23 +- .../default/xui/es/panel_audio_device.xml | 48 +- .../skins/default/xui/es/panel_avatar.xml | 433 +- .../xui/es/panel_avatar_classified.xml | 68 +- .../default/xui/es/panel_avatar_pick.xml | 14 +- .../skins/default/xui/es/panel_chat_bar.xml | 35 +- .../default/xui/es/panel_group_invite.xml | 40 +- .../default/xui/es/panel_group_land_money.xml | 128 +- .../default/xui/es/panel_preferences_im.xml | 58 +- .../xui/es/panel_preferences_popups.xml | 34 +- .../default/xui/es/panel_preferences_web.xml | 48 +- .../skins/default/xui/es/panel_status_bar.xml | 66 +- .../skins/default/xui/es/ui_strings.xml | 2 +- indra/newview/skins/default/xui/fr/alerts.xml | 2 +- .../skins/default/xui/fr/floater_about.xml | 152 +- .../default/xui/fr/floater_about_land.xml | 572 +- .../xui/fr/floater_active_speakers.xml | 22 +- .../xui/fr/floater_animation_preview.xml | 329 +- .../default/xui/fr/floater_area_search.xml | 76 +- .../skins/default/xui/fr/floater_auction.xml | 27 +- .../default/xui/fr/floater_audio_volume.xml | 8 +- .../default/xui/fr/floater_avatar_picker.xml | 80 +- .../xui/fr/floater_avatar_textures.xml | 56 +- .../skins/default/xui/fr/floater_beacons.xml | 29 +- .../default/xui/fr/floater_build_options.xml | 16 +- .../default/xui/fr/floater_bulk_perms.xml | 88 +- .../skins/default/xui/fr/floater_bumps.xml | 42 +- .../default/xui/fr/floater_buy_contents.xml | 42 +- .../default/xui/fr/floater_buy_currency.xml | 138 +- .../skins/default/xui/fr/floater_buy_land.xml | 486 +- .../default/xui/fr/floater_buy_object.xml | 52 +- .../skins/default/xui/fr/floater_camera.xml | 24 +- .../default/xui/fr/floater_chat_history.xml | 189 +- .../default/xui/fr/floater_chatterbox.xml | 5 +- .../default/xui/fr/floater_choose_group.xml | 19 +- .../default/xui/fr/floater_color_picker.xml | 64 +- .../skins/default/xui/fr/floater_critical.xml | 22 +- .../default/xui/fr/floater_customize.xml | 987 ++- .../xui/fr/floater_day_cycle_options.xml | 191 +- .../xui/fr/floater_device_settings.xml | 5 +- .../default/xui/fr/floater_directory.xml | 837 ++- .../default/xui/fr/floater_display_name.xml | 47 +- .../default/xui/fr/floater_env_settings.xml | 54 +- .../default/xui/fr/floater_font_test.xml | 12 +- .../skins/default/xui/fr/floater_gesture.xml | 37 +- .../default/xui/fr/floater_god_tools.xml | 222 +- .../default/xui/fr/floater_group_info.xml | 522 +- .../xui/fr/floater_hardware_settings.xml | 155 +- .../skins/default/xui/fr/floater_html.xml | 32 +- .../skins/default/xui/fr/floater_hud.xml | 4 +- .../skins/default/xui/fr/floater_im.xml | 88 +- .../default/xui/fr/floater_image_preview.xml | 124 +- .../skins/default/xui/fr/floater_import.xml | 34 +- .../skins/default/xui/fr/floater_inspect.xml | 25 +- .../xui/fr/floater_instant_message.xml | 109 +- .../xui/fr/floater_instant_message_ad_hoc.xml | 84 +- .../xui/fr/floater_instant_message_group.xml | 93 +- .../default/xui/fr/floater_inventory.xml | 196 +- .../fr/floater_inventory_item_properties.xml | 170 +- .../xui/fr/floater_inventory_view_finder.xml | 48 +- .../skins/default/xui/fr/floater_joystick.xml | 167 +- .../skins/default/xui/fr/floater_lagmeter.xml | 304 +- .../default/xui/fr/floater_land_holdings.xml | 80 +- .../default/xui/fr/floater_landmark_ctrl.xml | 20 +- .../default/xui/fr/floater_live_lsleditor.xml | 24 +- .../default/xui/fr/floater_lsl_guide.xml | 14 +- .../default/xui/fr/floater_media_browser.xml | 40 +- .../default/xui/fr/floater_mem_leaking.xml | 36 +- .../skins/default/xui/fr/floater_mini_map.xml | 8 +- .../skins/default/xui/fr/floater_moveview.xml | 24 +- .../skins/default/xui/fr/floater_mute.xml | 24 +- .../default/xui/fr/floater_mute_object.xml | 23 +- .../default/xui/fr/floater_my_friends.xml | 14 +- .../xui/fr/floater_name_description.xml | 22 +- .../skins/default/xui/fr/floater_new_im.xml | 22 +- .../xui/fr/floater_new_outfit_dialog.xml | 176 +- .../default/xui/fr/floater_notification.xml | 14 +- .../xui/fr/floater_notifications_console.xml | 10 +- .../default/xui/fr/floater_object_im_info.xml | 32 +- .../default/xui/fr/floater_openobject.xml | 16 +- .../skins/default/xui/fr/floater_pay.xml | 44 +- .../default/xui/fr/floater_pay_object.xml | 62 +- .../default/xui/fr/floater_perm_prefs.xml | 32 +- .../default/xui/fr/floater_post_process.xml | 108 +- .../skins/default/xui/fr/floater_postcard.xml | 88 +- .../default/xui/fr/floater_preferences.xml | 18 +- .../xui/fr/floater_preview_animation.xml | 33 +- .../xui/fr/floater_preview_classified.xml | 4 +- .../default/xui/fr/floater_preview_event.xml | 4 +- .../fr/floater_preview_existing_landmark.xml | 17 +- .../xui/fr/floater_preview_gesture.xml | 132 +- .../xui/fr/floater_preview_notecard.xml | 32 +- .../floater_preview_notecard_keep_discard.xml | 34 +- .../default/xui/fr/floater_preview_sound.xml | 24 +- .../xui/fr/floater_preview_texture.xml | 25 +- .../default/xui/fr/floater_preview_url.xml | 4 +- .../xui/fr/floater_price_for_listing.xml | 38 +- .../skins/default/xui/fr/floater_profile.xml | 8 +- .../default/xui/fr/floater_region_info.xml | 4 +- .../default/xui/fr/floater_report_abuse.xml | 366 +- .../default/xui/fr/floater_report_bug.xml | 216 +- .../default/xui/fr/floater_script_debug.xml | 12 +- .../xui/fr/floater_script_ed_panel.xml | 86 +- .../default/xui/fr/floater_script_preview.xml | 12 +- .../default/xui/fr/floater_script_queue.xml | 8 +- .../default/xui/fr/floater_script_search.xml | 30 +- .../default/xui/fr/floater_select_key.xml | 14 +- .../default/xui/fr/floater_sell_land.xml | 144 +- .../default/xui/fr/floater_settings_debug.xml | 34 +- .../xui/fr/floater_sim_release_message.xml | 32 +- .../xui/fr/floater_skin_preview_template.xml | 68 +- .../skins/default/xui/fr/floater_snapshot.xml | 279 +- .../default/xui/fr/floater_sound_preview.xml | 39 +- .../default/xui/fr/floater_statistics.xml | 4 +- .../skins/default/xui/fr/floater_telehub.xml | 62 +- .../skins/default/xui/fr/floater_test.xml | 4 +- .../default/xui/fr/floater_texture_ctrl.xml | 48 +- .../skins/default/xui/fr/floater_tools.xml | 1290 ++-- .../default/xui/fr/floater_top_objects.xml | 110 +- .../skins/default/xui/fr/floater_tos.xml | 54 +- .../default/xui/fr/floater_url_entry.xml | 26 +- .../default/xui/fr/floater_voice_wizard.xml | 18 +- .../skins/default/xui/fr/floater_water.xml | 178 +- .../xui/fr/floater_wearable_save_as.xml | 22 +- .../xui/fr/floater_windlight_options.xml | 380 +- .../default/xui/fr/floater_world_map.xml | 144 +- indra/newview/skins/default/xui/fr/fonts.xml | 18 +- .../skins/default/xui/fr/menu_inventory.xml | 160 +- .../skins/default/xui/fr/menu_login.xml | 54 +- .../skins/default/xui/fr/menu_mini_map.xml | 16 +- .../default/xui/fr/menu_pie_attachment.xml | 30 +- .../skins/default/xui/fr/menu_pie_avatar.xml | 36 +- .../skins/default/xui/fr/menu_pie_land.xml | 20 +- .../skins/default/xui/fr/menu_pie_object.xml | 54 +- .../skins/default/xui/fr/menu_pie_self.xml | 75 +- .../skins/default/xui/fr/menu_slurl.xml | 12 +- .../skins/default/xui/fr/menu_viewer.xml | 552 +- .../skins/default/xui/fr/mime_types.xml | 460 +- .../skins/default/xui/fr/notifications.xml | 6217 +++++++++-------- indra/newview/skins/default/xui/fr/notify.xml | 8 +- .../skins/default/xui/fr/panel_audio.xml | 20 +- .../default/xui/fr/panel_audio_device.xml | 50 +- .../skins/default/xui/fr/panel_avatar.xml | 460 +- .../xui/fr/panel_avatar_classified.xml | 74 +- .../default/xui/fr/panel_avatar_pick.xml | 20 +- .../skins/default/xui/fr/panel_chat_bar.xml | 41 +- .../skins/default/xui/fr/panel_classified.xml | 62 +- .../skins/default/xui/fr/panel_event.xml | 140 +- .../skins/default/xui/fr/panel_friends.xml | 56 +- .../skins/default/xui/fr/panel_group.xml | 26 +- .../default/xui/fr/panel_group_finder.xml | 18 +- .../default/xui/fr/panel_group_general.xml | 193 +- .../default/xui/fr/panel_group_invite.xml | 52 +- .../default/xui/fr/panel_group_land_money.xml | 166 +- .../default/xui/fr/panel_group_notices.xml | 148 +- .../default/xui/fr/panel_group_roles.xml | 437 +- .../default/xui/fr/panel_group_voting.xml | 339 +- .../skins/default/xui/fr/panel_groups.xml | 61 +- .../default/xui/fr/panel_land_covenant.xml | 78 +- .../skins/default/xui/fr/panel_login.xml | 121 +- .../default/xui/fr/panel_master_volume.xml | 10 +- .../default/xui/fr/panel_media_controls.xml | 76 +- .../default/xui/fr/panel_media_remote.xml | 20 +- .../xui/fr/panel_media_remote_expanded.xml | 56 +- .../skins/default/xui/fr/panel_mini_map.xml | 54 +- .../xui/fr/panel_notifications_channel.xml | 30 +- .../skins/default/xui/fr/panel_overlaybar.xml | 51 +- .../skins/default/xui/fr/panel_place.xml | 78 +- .../default/xui/fr/panel_place_small.xml | 86 +- .../xui/fr/panel_preferences_ascent_chat.xml | 112 + .../fr/panel_preferences_ascent_system.xml | 668 +- .../fr/panel_preferences_ascent_vanity.xml | 55 + .../xui/fr/panel_preferences_audio.xml | 62 +- .../default/xui/fr/panel_preferences_chat.xml | 250 +- .../xui/fr/panel_preferences_general.xml | 291 +- .../xui/fr/panel_preferences_graphics1.xml | 463 +- .../xui/fr/panel_preferences_grids.xml | 484 +- .../default/xui/fr/panel_preferences_im.xml | 67 +- .../xui/fr/panel_preferences_input.xml | 66 +- .../xui/fr/panel_preferences_network.xml | 67 +- .../xui/fr/panel_preferences_popups.xml | 44 +- .../xui/fr/panel_preferences_skins.xml | 49 +- .../xui/fr/panel_preferences_voice.xml | 62 +- .../default/xui/fr/panel_preferences_web.xml | 24 +- .../default/xui/fr/panel_region_covenant.xml | 163 +- .../default/xui/fr/panel_region_debug.xml | 80 +- .../default/xui/fr/panel_region_estate.xml | 156 +- .../default/xui/fr/panel_region_general.xml | 118 +- .../default/xui/fr/panel_region_terrain.xml | 54 +- .../default/xui/fr/panel_region_texture.xml | 144 +- .../default/xui/fr/panel_scrolling_param.xml | 24 +- .../default/xui/fr/panel_speaker_controls.xml | 82 +- .../skins/default/xui/fr/panel_status_bar.xml | 82 +- .../skins/default/xui/fr/panel_toolbar.xml | 34 +- .../skins/default/xui/fr/panel_top_pick.xml | 20 +- .../default/xui/fr/panel_voice_controls.xml | 20 +- .../default/xui/fr/panel_voice_enable.xml | 46 +- .../default/xui/fr/panel_voice_options.xml | 42 +- .../default/xui/fr/panel_voice_remote.xml | 10 +- .../xui/fr/panel_voice_remote_expanded.xml | 10 +- .../skins/default/xui/fr/role_actions.xml | 402 +- .../newview/skins/default/xui/fr/strings.xml | 1207 ++-- .../skins/default/xui/fr/teleport_strings.xml | 105 +- .../default/xui/fr/teleport_strings2.xml | 77 + .../skins/default/xui/fr/ui_strings.xml | 21 +- .../skins/default/xui/fr/xui_version.xml | 8 +- 270 files changed, 18468 insertions(+), 18438 deletions(-) create mode 100644 indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml create mode 100644 indra/newview/skins/default/xui/fr/teleport_strings2.xml diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index bd6044274..5b421b9d0 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -14,7 +14,7 @@ Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code. Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, -maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas +maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying Second Life is brought to you by 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, diff --git a/indra/newview/skins/default/xui/es/alerts.xml b/indra/newview/skins/default/xui/es/alerts.xml index e2ac429e4..2c3c306e9 100644 --- a/indra/newview/skins/default/xui/es/alerts.xml +++ b/indra/newview/skins/default/xui/es/alerts.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index a7484f4f3..48ddb47ea 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -1,47 +1,57 @@ - - -