From ee2ed21aacb473301d36b8f4c450cb96c3ae39d3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 9 Oct 2009 19:53:10 -0500 Subject: Updated and added some Linux libs. Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml Added: gstreamer-plugins, theora --- ChangeLog.txt | 19 ++++++++ linden/indra/cmake/GStreamer.cmake | 15 +++--- linden/indra/cmake/UI.cmake | 7 ++- linden/indra/newview/viewer_manifest.py | 16 +------ linden/install.xml | 81 +++++++++++++++++++++------------ 5 files changed, 87 insertions(+), 51 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0fe80e5..7781f81 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,18 @@ =- 1.2.0 BETA 2 -= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +2009-10-09 Jacek Antonelli + + * Updated and added some Linux libs. + Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml + Added: gstreamer-plugins, theora + + modified: linden/indra/newview/viewer_manifest.py + modified: linden/indra/cmake/GStreamer.cmake + modified: linden/indra/cmake/UI.cmake + modified: linden/install.xml + + 2009-10-09 McCabe Maxsted * Updated version info to 1.2.0 beta 2, added changelog banner. @@ -152,6 +164,13 @@ modified: linden/indra/newview/skins/default/xui/en-us/notify.xml 2009-10-03 Jacek Antonelli + * Updated and added some Linux libs to install.xml. + Updated: glib, gstreamer, ogg-vorbis, openal + Added: gstreamer-plugins, theora + + modified: linden/install.xml + + * Grid manager no longer appends "/" to URIs. This was causing trouble with URIs that shouldn't end in "/". diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 8bfad11..51e1550 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -1,18 +1,19 @@ # -*- cmake -*- include(Prebuilt) - # possible libxml should have its own .cmake file instead + # Maybe libxml and glib should have their own .cmake files use_prebuilt_binary(libxml) + use_prebuilt_binary(glib) + set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) + use_prebuilt_binary(gstreamer) + use_prebuilt_binary(gstreamer-plugins) if (WINDOWS) - use_prebuilt_binary(libxml) use_prebuilt_binary(iconv) - use_prebuilt_binary(glib) - use_prebuilt_binary(gstreamer-plugins) set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib @@ -63,7 +64,7 @@ else (WINDOWS) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 ) - if (DARWIN) + if (DARWIN) # Mac find_library( XML2_LIB NAMES xml2.2 @@ -89,7 +90,9 @@ else (WINDOWS) ${XML2_LIB} ) - else (DARWIN) + else (DARWIN) # Linux + + use_prebuilt_binary(theora) set(GSTREAMER_LIBRARIES gstvideo-0.10 diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake index f529f5b..b70a531 100644 --- a/linden/indra/cmake/UI.cmake +++ b/linden/indra/cmake/UI.cmake @@ -31,13 +31,13 @@ if (STANDALONE) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (STANDALONE) - use_prebuilt_binary(gtk-atk-pango-glib) + use_prebuilt_binary(gtk-etc) if (LINUX) set(UI_LIBRARIES atk-1.0 + cairo gdk-x11-2.0 gdk_pixbuf-2.0 - Xinerama glib-2.0 gmodule-2.0 gobject-2.0 @@ -47,11 +47,14 @@ else (STANDALONE) pangoft2-1.0 pangox-1.0 pangoxft-1.0 + pixman-1 ) endif (LINUX) include_directories ( ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1 ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 6ae5b80..b4a0b6c 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -798,14 +798,11 @@ class Linux_i686Manifest(LinuxManifest): self.path("libELFIO.so") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") - self.path("libopenal.so") # symlink self.path("libopenal.so.1") - self.path("libalut.so") + self.path("libalut.so.0") # Gstreamer libs - self.path("libgstbase-0.10.so") # symlink self.path("libgstbase-0.10.so.0") - self.path("libgstreamer-0.10.so") # symlink self.path("libgstreamer-0.10.so.0") self.path("libgstaudio-0.10.so.0") self.path("libgstbase-0.10.so.0") @@ -822,18 +819,10 @@ class Linux_i686Manifest(LinuxManifest): self.path("libgstvideo-0.10.so.0") # Gstreamer plugin dependencies - self.path("libavcodec.so.52") - self.path("libavformat.so.52") - self.path("libavutil.so.49") - self.path("libxvidcore.so.4") - self.path("libfaac.so.0") - self.path("libfaad.so.1") - self.path("libmp3lame.so.0") self.path("libogg.so.0") + self.path("libtheora.so.0") self.path("libvorbis.so.0") self.path("libvorbisenc.so.2") - self.path("libxml2.so.2") - self.path("libxvidcore.so.4") # Gstreamer plugins if self.prefix("gstreamer-plugins"): @@ -848,7 +837,6 @@ class Linux_i686Manifest(LinuxManifest): self.path("libgstdecodebin2.so") self.path("libgstdecodebin.so") self.path("libgstesd.so") - self.path("libgstffmpegcolorspace.so") self.path("libgstffmpeg.so") self.path("libgstgnomevfs.so") self.path("libgsticydemux.so") diff --git a/linden/install.xml b/linden/install.xml index a713b0e..455c7df 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -545,9 +545,9 @@ linux md5sum - 2f1a9e14f9213c2c9564c1c1cfdd6d47 + 674b2a79cef8ddd28f53b28b44dcffe2 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2 + http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091009.tar.bz2 windows @@ -582,9 +582,9 @@ linux md5sum - c829b638b6eef71ca63418cb9aea46a2 + 591900261bddbe3d1e579f7e6070081a url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2 + http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091005.tar.bz2 windows @@ -601,6 +601,13 @@ lgpl packages + linux + + md5sum + 2cce992f4506fbc11f827aa80eb499f4 + url + http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091008.tar.bz2 + windows md5sum @@ -610,12 +617,16 @@ - gtk-atk-pango-glib + gtk-etc copyright - Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald +atk: Copyright 2001 Sun Microsystems Inc. +cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Red Hat, Inc. + + description - Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization. + GTK+ and associated libraries (atk, cairo, pango, pixman) license lgpl packages @@ -623,16 +634,9 @@ linux md5sum - 21c16a74f8fc9a62e3ab944a6eb7403d + 143844d33c5075bf30f8af1fd86a6f09 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz - - linux32 - - md5sum - 21c16a74f8fc9a62e3ab944a6eb7403d - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz + http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091008.tar.bz2 @@ -901,9 +905,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - 4b5d2dcfe8a49b73fb69f10aab441092 + cec4328f5808b49836c467831a5f285e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2 + http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091005.tar.bz2 linux32 @@ -1080,7 +1084,7 @@ anguage Infrstructure (CLI) international standard description Ogg: container format Vorbis: audio compression scheme license - ogg-vorbis + xiph-bsd packages darwin @@ -1093,9 +1097,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - df1809565b87b1dc28e3ca70db6e7d46 + 92c614b34fc283588625805076d58e93 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080812.tar.bz2 + http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091003.tar.bz2 linux64 @@ -1133,9 +1137,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - f0d9a8d1318b519cffe6c40c9cac4e21 + 6f69d70ec18a3c3c2dee81bf6331c784 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2 + http://imprudenceviewer.org/download/libs/openal-linux-20091009.tar.bz2 windows @@ -1207,11 +1211,11 @@ anguage Infrstructure (CLI) international standard http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2 linux - - md5sum - 02af0dad64803e0d821bc09e6038682c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2 + + md5sum + 02af0dad64803e0d821bc09e6038682c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2 windows @@ -1281,6 +1285,25 @@ anguage Infrstructure (CLI) international standard + theora + + copyright + Copyright (C) 2002-2009 Xiph.org Foundation + description + Ogg Theora video format + license + xiph-bsd + packages + + linux + + md5sum + a6e6e250efaf3f25db4699d9b5dfec4b + url + http://imprudenceviewer.org/download/libs/theora-linux-20091003.tar.bz2 + + + tut copyright @@ -1609,7 +1632,7 @@ Cass Everitt - cass@r3.nu url http://www.mozilla.org/MPL/MPL-1.1.html - ogg-vorbis + xiph-bsd url http://www.xiph.org/licenses/bsd/ -- cgit v1.1 -- cgit v1.1 From 428efd664d6629f8c590016c80d8a86181bbc2d4 Mon Sep 17 00:00:00 2001 From: Lilly Zenovka Date: Mon, 19 Oct 2009 09:02:41 +0200 Subject: Fixes VWR-12161: avatar_skeleton.xml cannot be parsed --- linden/indra/llmedia/llmediaimplllmozlib.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp index 05d7220..93f4a64 100644 --- a/linden/indra/llmedia/llmediaimplllmozlib.cpp +++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp @@ -49,9 +49,9 @@ #include "GL/gl.h" #endif -#if LL_LINUX - #include -#endif + +#include + #include @@ -89,23 +89,23 @@ LLMediaImplLLMozLib::LLMediaImplLLMozLib() : // (static) super-initialization - called once at application startup bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data ) { -#if LL_LINUX + // Yuck, Mozilla's GTK callbacks play with the locale - push/pop // the locale to protect it, as exotic/non-C locales // causes our code lots of general critical weirdness // and crashness. (SL-35450) static std::string saved_locale; saved_locale = setlocale(LC_ALL, NULL); -#endif // LL_LINUX + bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(), init_data->getBrowserComponentDir(), init_data->getBrowserProfileDir(), init_data->getBrowserParentWindow() ); -#if LL_LINUX + setlocale(LC_ALL, saved_locale.c_str() ); -#endif // LL_LINUX + return result; } -- cgit v1.1 From b81968c663282db7eb5db5b8e506aa533c636ccc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 19 Oct 2009 01:44:31 -0700 Subject: Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2) --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/llappviewer.cpp | 2 +- linden/indra/newview/llstartup.cpp | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 255f334..fbdabd6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-10-19 McCabe Maxsted + + * Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2). + + modified: linden/indra/newview/llappviewer.cpp + modified: linden/indra/newview/llstartup.cpp + + 2009-10-17 McCabe Maxsted * Ported notecard security fix from LL's 1.23.5 viewer. diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 448e26b..c432066 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3927,7 +3927,7 @@ void LLAppViewer::handleLoginComplete() writeDebugInfo(); // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e - // TODO-RLVa: find some way to initialize the lookup table when we need them *and* support toggling RLVa at runtime + // NOTE: this function isn't called in Imprudence so any changes need to go in idle_startup() instead gRlvHandler.initLookupTables(); if (rlv_handler_t::isEnabled()) diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 346f7dd..d747bd2 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2647,6 +2647,23 @@ bool idle_startup() LLAppViewer::instance()->initMainloopTimeout("Mainloop Init"); +// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e + // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function + gRlvHandler.initLookupTables(); + + if (rlv_handler_t::isEnabled()) + { + RlvCurrentlyWorn::fetchWorn(); + rlv_handler_t::fetchSharedInventory(); + + #ifdef RLV_EXTENSION_STARTLOCATION + RlvSettings::updateLoginLastLocation(); + #endif // RLV_EXTENSION_STARTLOCATION + + gRlvHandler.processRetainedCommands(); + } +// [/RLVa:KB] + return TRUE; } -- cgit v1.1 From c0b31fcc3e16436ded72c4d36eb5a0d704fa7b8d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 19 Oct 2009 10:33:38 -0700 Subject: Clamp map teleporting at 4096 rather than 1000 --- ChangeLog.txt | 5 +++++ linden/indra/newview/llfloaterworldmap.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index fbdabd6..89920a8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2009-10-19 McCabe Maxsted + * Clamp map teleporting at 4096 rather than 1000. + + modified: linden/indra/newview/llfloaterworldmap.cpp + + * Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2). modified: linden/indra/newview/llappviewer.cpp diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp index 70223c9..028ebf2 100644 --- a/linden/indra/newview/llfloaterworldmap.cpp +++ b/linden/indra/newview/llfloaterworldmap.cpp @@ -770,7 +770,7 @@ void LLFloaterWorldMap::updateLocation() void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) { LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); - z_coord = llclamp(z_coord, 0, 1000); + z_coord = llclamp(z_coord, 0, 4096); if (sim_info) { LLVector3 local_pos; -- cgit v1.1 From 95b78d58fa6e1f18160fb42252d2f6b0e87ca372 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 19 Oct 2009 21:06:17 -0700 Subject: Partial fix for avatar names not displaying at > 1024m (won't be fixed until LL actually sends height in more than one byte -_-) --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llfloatermap.cpp | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 89920a8..5a4670d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2009-10-19 McCabe Maxsted + * Partial fix for avatar names not displaying at > 1024m + (won't be fixed until LL actually sends height in more than one byte -_-) + + modified: linden/indra/newview/llfloatermap.cpp + + * Clamp map teleporting at 4096 rather than 1000. modified: linden/indra/newview/llfloaterworldmap.cpp diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp index 31e57a0..3807a90 100644 --- a/linden/indra/newview/llfloatermap.cpp +++ b/linden/indra/newview/llfloatermap.cpp @@ -279,12 +279,25 @@ void LLFloaterMap::populateRadar() // [/RLVa:KB] // check if they're in certain ranges and notify user if we've enabled that - LLVector3d temp = positions[i] - current_pos; - F32 distance = llround((F32)temp.magVec(), 0.1f); - /*char dist[32]; - sprintf(dist, "%.1f", distance); - std::string dist_string = dist;*/ - std::string dist_string = llformat("%.1f", distance); + LLVector3d temp = positions[i]; + if (positions[i].mdV[VZ] == 0.0f) // LL only sends height value up to 1024m, try to work around it + { + LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]); + if (av_obj != NULL && av_obj->isAvatar()) + { + LLVOAvatar* avatarp = (LLVOAvatar*)av_obj; + if (avatarp != NULL) + { + temp = avatarp->getPositionGlobal(); + } + } + } + F64 distance = dist_vec(temp, current_pos); + // we round for accuracy when avs tp in + std::string dist_string = llformat("%.1f", llround((F32)distance, 0.1f)); + + /*llinfos << "Avatar :" << fullname << " Position: " << positions[i] << " Your Position: " + << current_pos << " Distance: " << distance << llendl;*/ if (notify_chat) { -- cgit v1.1 From 65e2f7b4d2f080a5bcbe00a1926f7f95e7926a79 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 21 Oct 2009 16:48:52 -0700 Subject: Added Advanced menu option for AllowMultipleViewers for testing purposes --- ChangeLog.txt | 8 ++++++ linden/indra/newview/llviewermenu.cpp | 32 +++++++++++++++++++++- .../skins/default/xui/en-us/menu_viewer.xml | 7 +++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5a4670d..3a474b4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-10-21 McCabe Maxsted + + * Added Advanced menu option for AllowMultipleViewers for testing purposes. + + modified: linden/indra/newview/llviewermenu.cpp + modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml + + 2009-10-19 McCabe Maxsted * Partial fix for avatar names not displaying at > 1024m diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 4493ddf..d0e326c 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -10368,6 +10368,35 @@ class LLAvatarReportAbuse : public view_listener_t +//////////////////////////// +// ALLOW MULTIPLE VIEWERS // +//////////////////////////// + + +class LLAdvancedToggleMultipleViewers : public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + BOOL cur_val = gSavedSettings.getBOOL("AllowMultipleViewers"); + gSavedSettings.setBOOL("AllowMultipleViewers", !cur_val ); + return true; + } +}; + + +class LLAdvancedCheckMultipleViewers : public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + bool new_value = gSavedSettings.getBOOL("AllowMultipleViewers"); + std::string control_name = userdata["control"].asString(); + gMenuHolder->findControl(control_name)->setValue(new_value); + return true; + } +}; + + + /////////////// // RLVa Main // /////////////// @@ -10793,7 +10822,8 @@ void initialize_menus() addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions"); addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus"); addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus"); - + addMenu(new LLAdvancedToggleMultipleViewers(), "Advanced.ToggleMultipleViewers"); + addMenu(new LLAdvancedCheckMultipleViewers(), "Advanced.CheckMultipleViewers"); // RLVa addMenu(new RLVaMainToggle(), "RLVa.Main.Toggle"); diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 8d55a3b..222a9ad 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -2009,6 +2009,13 @@ + + + + + + * Capped chat channel spinner to 1000000 (1 mil) as temp fix. + Very high numbers cause mysterious rounding problems. + + modified: linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml + modified: linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml: + + 2009-10-21 McCabe Maxsted * Added Advanced menu option for AllowMultipleViewers for testing purposes. diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml index dd66a83..ed23d8d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml @@ -61,7 +61,7 @@ Gestures + * Moved "Logout" to Advanced menu, removed shortcut. + We want to discourage its use until issues are fixed in 1.3. + + modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml + + * Capped chat channel spinner to 1000000 (1 mil) as temp fix. Very high numbers cause mysterious rounding problems. diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 222a9ad..459bf44 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -74,10 +74,6 @@ userdata="" /> - - - @@ -2016,6 +2012,9 @@ + + + + * Moved radar XML to panel_radar.xml and cleaned it up. + It had been in floater_mini_map.xml. + + modified: linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml + new file: linden/indra/newview/skins/default/xui/en-us/panel_radar.xml + + * Moved "Logout" to Advanced menu, removed shortcut. We want to discourage its use until issues are fixed in 1.3. diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml index 57f955f..b24004b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml @@ -1,107 +1,18 @@ - + + + follows="left|top|right|bottom" mouse_opaque="false" /> + + follows="left|right|bottom" /> - - 0 - - - Avatars in - - - - m - - - -