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(-) (limited to 'linden') 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) --- linden/indra/newview/llappviewer.cpp | 2 +- linden/indra/newview/llstartup.cpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'linden') 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 --- linden/indra/newview/llfloaterworldmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') 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 -_-) --- linden/indra/newview/llfloatermap.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'linden') 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 --- linden/indra/newview/llviewermenu.cpp | 32 +++++++++++++++++++++- .../skins/default/xui/en-us/menu_viewer.xml | 7 +++++ 2 files changed, 38 insertions(+), 1 deletion(-) (limited to 'linden') 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 @@ + + + + Gestures - - - @@ -2016,6 +2012,9 @@ + + + - + + + follows="left|top|right|bottom" mouse_opaque="false" /> + + follows="left|right|bottom" /> - - 0 - - - Avatars in - - - - m - - - -