From 958934ee4bb29d31924b938419c51f0fe18a4c4c Mon Sep 17 00:00:00 2001 From: Tofu Buzzard Date: Sat, 27 Nov 2010 13:24:19 +0000 Subject: Some BOOL->bool that was bugging me. --- indra/llmath/llmath.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index 798f1154d0..b86768456d 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -106,7 +106,7 @@ const F32 F_ALMOST_ONE = 1.0f - F_ALMOST_ZERO; const F32 FP_MAG_THRESHOLD = 0.0000001f; // TODO: Replace with logic like is_approx_equal -inline BOOL is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f < F_APPROXIMATELY_ZERO); } +inline bool is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f < F_APPROXIMATELY_ZERO); } // These functions work by interpreting sign+exp+mantissa as an unsigned // integer. @@ -132,13 +132,13 @@ inline BOOL is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f < // WARNING: Infinity is comparable with F32_MAX and negative // infinity is comparable with F32_MIN -inline BOOL is_approx_equal(F32 x, F32 y) +inline bool is_approx_equal(F32 x, F32 y) { const S32 COMPARE_MANTISSA_UP_TO_BIT = 0x02; return (std::abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT); } -inline BOOL is_approx_equal(F64 x, F64 y) +inline bool is_approx_equal(F64 x, F64 y) { const S64 COMPARE_MANTISSA_UP_TO_BIT = 0x02; return (std::abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT); -- cgit v1.2.3 From 98ce08c8fd272e0956759de857d65e6d50922677 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 30 Mar 2012 18:06:21 -0400 Subject: STORM-1820 Discoverability of the menu that opens the Block List is difficult --- doc/contributions.txt | 1 + indra/newview/llviewermenu.cpp | 14 ++++++++++++++ indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index c5db396c97..71f1efccf6 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -610,6 +610,7 @@ Jonathan Yap STORM-1788 STORM-1799 STORM-1796 + STORM-1820 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 99540ccce9..138ba11f95 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5256,6 +5256,17 @@ void toggle_debug_menus(void*) // } // +class LLCommunicateBlockList : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + // we just send the message and let the server check for failure cases + // server will echo back a "Home position set." alert if it succeeds + // and the home location screencapture happens when that alert is recieved + LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD()); + return true; + } +}; class LLWorldSetHomeLocation : public view_listener_t { @@ -8040,6 +8051,9 @@ void initialize_menus() // Me > Movement view_listener_t::addMenu(new LLAdvancedAgentFlyingInfo(), "Agent.getFlying"); + + // Communicate + view_listener_t::addMenu(new LLCommunicateBlockList(), "Communicate.BlockList"); // World menu view_listener_t::addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1d11abcf73..fcca0172f0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -291,6 +291,12 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> + + + Date: Fri, 30 Mar 2012 18:11:28 -0400 Subject: STORM-1820 Remove incorrect comment --- indra/newview/llviewermenu.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 138ba11f95..e3cb1ebe10 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5260,9 +5260,6 @@ class LLCommunicateBlockList : public view_listener_t { bool handleEvent(const LLSD& userdata) { - // we just send the message and let the server check for failure cases - // server will echo back a "Home position set." alert if it succeeds - // and the home location screencapture happens when that alert is recieved LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD()); return true; } -- cgit v1.2.3 From 9df3afc1efd92c5c080703f5d1dc858dbeafea1c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 6 Apr 2012 09:48:54 -0400 Subject: STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now that explicit ban height has been changed. --- doc/contributions.txt | 1 + indra/llinventory/llparcel.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index c5db396c97..3e74c0b796 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -610,6 +610,7 @@ Jonathan Yap STORM-1788 STORM-1799 STORM-1796 + STORM-1839 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index e36d0b20d2..f0b2caca3d 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -45,7 +45,7 @@ const S32 PARCEL_UNIT_AREA = 16; const F32 PARCEL_HEIGHT = 50.f; //Height above ground which parcel boundries exist for explicitly banned avatars -const F32 BAN_HEIGHT = 768.f; +const F32 BAN_HEIGHT = 5000.f; // Maximum number of entries in an access list const S32 PARCEL_MAX_ACCESS_LIST = 300; -- cgit v1.2.3 From 2b0318ffd07b20a523c58156718ffab1a9d51271 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Tue, 10 Apr 2012 16:01:46 -0400 Subject: STORM-1842 Don't save per-account settings if login not fully successful Repo created from Firestorm patch by Jonathan Yap --- doc/contributions.txt | 2 ++ indra/newview/llappviewer.cpp | 12 ++++++++++++ indra/newview/llappviewer.h | 1 + 3 files changed, 15 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index c5db396c97..15169b30b5 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -610,6 +610,7 @@ Jonathan Yap STORM-1788 STORM-1799 STORM-1796 + STORM-1842 Kadah Coba STORM-1060 Jondan Lundquist @@ -1262,6 +1263,7 @@ Zi Ree VWR-24017 VWR-25588 STORM-1790 + STORM-1842 Zipherius Turas VWR-76 VWR-77 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 49fbdbf1df..c0197db4fc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -622,6 +622,7 @@ LLAppViewer::LLAppViewer() : mPurgeOnExit(false), mSecondInstance(false), mSavedFinalSnapshot(false), + mSavePerAccountSettings(false), // don't save settings on logout unless login succeeded. mForceGraphicsDetail(false), mQuitRequested(false), mLogoutRequestSent(false), @@ -1739,6 +1740,13 @@ bool LLAppViewer::cleanup() { llinfos << "Not saving per-account settings; don't know the account name yet." << llendl; } + // Only save per account settings if the previous login succeeded, otherwise + // we might end up with a cleared out settings file in case a previous login + // failed after loading per account settings. + else if (!mSavePerAccountSettings) + { + llinfos << "Not saving per-account settings; last login was not successful." << llendl; + } else { gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE); @@ -4953,6 +4961,10 @@ void LLAppViewer::handleLoginComplete() mOnLoginCompleted(); writeDebugInfo(); + + // we logged in successfully, so save settings on logout + llinfos << "Login successful, per account settings will be saved on log out." << llendl; + mSavePerAccountSettings=TRUE; } // *TODO - generalize this and move DSO wrangling to a helper class -brad diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 71a7868191..a3d19301e7 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -251,6 +251,7 @@ private: bool mPurgeOnExit; bool mSavedFinalSnapshot; + bool mSavePerAccountSettings; // only save per account settings if login succeeded bool mForceGraphicsDetail; -- cgit v1.2.3 From bea4733193121a3918269101ba68fd7282e158ae Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 1 May 2012 12:19:00 -0400 Subject: STORM-1842 Change variable setting from TRUE to true --- indra/newview/llappviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c0197db4fc..8e8db07078 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4964,7 +4964,7 @@ void LLAppViewer::handleLoginComplete() // we logged in successfully, so save settings on logout llinfos << "Login successful, per account settings will be saved on log out." << llendl; - mSavePerAccountSettings=TRUE; + mSavePerAccountSettings=true; } // *TODO - generalize this and move DSO wrangling to a helper class -brad -- cgit v1.2.3 From 8593020037ab299f945ee2ad425ccb79ceba42cf Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 11 May 2012 11:33:03 -0400 Subject: STORM-1852 Altitude display stutters or is clamped when flying higher than 4096m --- doc/contributions.txt | 1 + indra/newview/llviewerobject.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 3851e62cfb..6370e14f48 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -625,6 +625,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1852 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index e590f29a9a..7c6ca90890 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2382,10 +2382,11 @@ void LLViewerObject::interpolateLinearMotion(const F64 & time, const F32 & dt) { // This will put the object underground, but we can't tell if it will stop // at ground level or not min_height = LLWorld::getInstance()->getMinAllowedZ(this, new_pos_global); + // Cap maximum height + new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]); } new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]); - new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]); // Check to see if it's going off the region LLVector3 temp(new_pos); -- cgit v1.2.3 From 0af7f001748a8f9f14ed24a5b270c0507f12a4dd Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 18 May 2012 05:58:25 -0400 Subject: STORM-1858 [TRUNCATED] FR - String truncation and floater not wide enough in the upload model window --- doc/contributions.txt | 1 + .../skins/default/xui/en/floater_model_preview.xml | 74 ++++++++++++---------- .../skins/default/xui/fr/floater_model_preview.xml | 2 +- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 3851e62cfb..8a7fbd690c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -625,6 +625,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1858 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 0e211551e6..5e92a12251 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1,8 +1,16 @@ - + Error: Dae parsing issue - see log for details. @@ -98,7 +106,7 @@ top_pad="15" left="0" height="300" - width="625" + width="635" name="import_tab" tab_position="top"> @@ -116,13 +124,13 @@ left="3" name="lod_tab_border" top_pad="0" - width="619" /> + width="629" /> + width="75" /> + width="75" /> + width="75" /> + width="75" /> - - - - - - - - Choose model file - - - - - Advanced users: If you are familiar with 3D content creation tools you may wish to use the Advanced Uploader. - - - - Choose model file to upload - - - - - Second Life supports COLLADA (.dae) files - - - - - - Dimensions (meters): - - - X Y Z - - - - - - WARNING: - - - You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. - - - - - - - - - Optimize model - - - - We have optimized the model for performance. Adjust it further if you wish. - - - Generating Level of Detail - - - Generate Level of Detail: High - - Generate Level of Detail: Medium - - Generate Level of Detail: Low - - Generate Level of Detail: Lowest - - - Performance - Faster rendering -Less detail -Lower prim weight - Accuracy - Slower rendering -More detail -Higher prim weight - - - ' - - ' - - ' - - - - Geometry preview - - - - - - High detail - - - Medium detail - - - Low detail - - - Lowest detail - - - - - - - - - Adjust physics - - - - We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model. - - - Performance - Faster rendering -Less detail -Lower prim weight - Accuracy - Slower rendering -More detail -Higher prim weight - - - Examples: -Moving objects -Flying objects -Vehicles - Examples: -Small static objects -Less detailed objects -Simple furniture - Examples: -Static objects -Detailed objects -Buildings - - - - Physics preview - - - - - - High detail - - - Medium detail - - - Low detail - - - Lowest detail - - - - - - - - - Review - - - - Impact to parcel/region: [EQUIV] prim equivalents - - Your account will be charged an upload fee of L$ [FEE]. - - By clicking the upload button, you confirm that you have the appropriate rights to the material contained in the model. - - - - - - - - - - - Upload complete - - - - Your model has been uploaded. - - - You will find it in the Objects folder in your inventory. - - Your account has been charged L$ [FEE]. - - - - - -