Commit Graph

49920 Commits (d63d3b4e7b3f70287cdbdb96c5a42f213b1c07ae)

Author SHA1 Message Date
Nicky d63d3b4e7b Merge. 2016-07-01 16:00:32 +02:00
PanteraPolnocy 8c1267f8fd Updated Polish translation 2016-07-01 14:46:17 +02:00
Kitty Barnett 188cad8e5e Merged with RLVa tip 2016-07-01 00:27:14 +02:00
Kitty Barnett cffa8397ad [FIXED] Can't (re)move items or folders when @unsharedwear or @unsharedunwear restricted
--HG--
branch : RLVa
2016-07-01 00:20:55 +02:00
Kitty Barnett a0842eedee [FIXED] @touchworld[:<uuid>]=n|y applies to other avatar's attachments + @touchattach[:<uuid>]=n|y isn't applied to other avatar's attachments
--HG--
branch : RLVa
2016-07-01 00:00:07 +02:00
Ansariel afc06fd0b7 Sync llappearancemgr.cpp with V3 2016-06-30 23:16:51 +02:00
Ansariel abf9738886 FIRE-19552: Re-apply fix for FIRE-13130: Unknown notification "NoVoiceConnect-GIAB" 2016-06-30 22:34:52 +02:00
Kitty Barnett 261b6de52f Merged with RLVa tip 2016-06-30 22:19:16 +02:00
Kitty Barnett ca9f5674ab [FIXED] Crash on @detach=force (thankies Eglan)
--HG--
branch : RLVa
2016-06-30 22:11:31 +02:00
Kitty Barnett 34b0daaf7e Merged with lgpl tip 2016-06-30 20:31:49 +02:00
Ansariel 9ba330afec OpenSim: Exchange Cinder Roxley's fix with her different version from Alchemy for region names missing on the worldmap in OpenSim 2016-06-28 20:03:51 +02:00
Ansariel 3af46da957 FIRE-15972: Recognize InWorldz IZURLs properly 2016-06-28 19:32:10 +02:00
Ansariel 88ff2c7a19 FIRE-19529: Group eject dialog doesn't show avatar name 2016-06-28 09:41:20 +02:00
Tonya Souther 74e20578f9 One last merge fix. 2016-06-25 21:41:11 -05:00
Tonya Souther 622a10bc8b Silence clang warning about using assignment result in conditional. 2016-06-25 21:33:42 -05:00
Tonya Souther 3448282944 Merge breakage fix. 2016-06-25 21:28:59 -05:00
Tonya Souther e62e3a1110 Cleanup merge. 2016-06-25 20:48:02 -05:00
Nicky 67091be7a4 Linux; Make sure GCC is still happy after latest updates. 2016-06-25 20:18:16 +02:00
Ansariel 98da46eac9 Merge Firestorm LGPL tip 2016-06-25 17:16:36 +02:00
Ansariel 1aa810be36 Disable useless diagnostics 2016-06-25 17:12:06 +02:00
Ansariel 222ba039ed Add some fixes to the client-side AO by Drake Arconis 2016-06-25 17:08:43 +02:00
Ansariel 072658a5d2 FIRE-19523: Transferable permissions inventory filter breaks filtering by timespan 2016-06-25 17:01:50 +02:00
Ansariel 30e565c6a8 Merge with Appearance-Misc 2016-06-25 16:53:09 +02:00
Ansariel 0ef2e4427d Merge with Viewer-Build 2016-06-25 16:52:51 +02:00
Ansariel 354ca02185 Close Viewer-Build branch
--HG--
branch : Viewer-Build
2016-06-25 16:51:45 +02:00
Ansariel 6c4f05252b Close Appearance-Misc branch
--HG--
branch : Appearance-Misc
2016-06-25 16:51:08 +02:00
Kitty Barnett 1afd940863 Merged with RLVa tip 2016-06-25 15:19:31 +02:00
Kitty Barnett 43f80a2803 [FIXED] GCC compiler issues (originally by Nicky Dasmijn - thank you)
* Change RlvCommandOptionHelper::parseOption<RlvCommandOptionGeneric>(rlvCmd.getOption()) to RlvCommandOptionHelper::parseOption<RlvCommandOptionGeneric>(rlvCmd.getOption(), rlvCmdOption ) as otherwise a wrong template go picked wich resulted in linker errors.
    => we don't (need to) check the return type in those cases since it can't ever fail to convert so we just end up with less nice looking code
  * Rearrange RlvBehaviourDictionary to be above the classes that need the defintion (RlvBehaviourDictionary::instance call)
  * Change '(".("RLV_FOLDER_FLAG_NOSTRIP")"' to '(".(" RLV_FOLDER_FLAG_NOSTRIP ")"'. The GCC preprecessor does not like it w/o spaces.
  * Add template<> to those specialization that missed it
  * Change template<> template<> to just template<>
    => GCC seems to hate the templated std::enable_if (try boost::enable_if in the future); meanwhile try to #define a solution
    => Nicky changed a function parameter name matching a template parameter name so start differentiating between the two

--HG--
branch : RLVa
2016-06-25 15:17:31 +02:00
Kitty Barnett 488b9a55fa [FIXED] Region sends object kill messages for worn attachments during teleport
-> the attachment will be killed on teleport and readded at some point after teleport (can be much, much later)
  -> since we clean up restrictions on detach (=kill) the attachments appears to loose restrictions
  -> problem is worse on viewers that hide the teleport screen and allow the user to interact with the world right up until the teleport sequence
  -> this is a simulator-side bug which isn't actually our business but users think it's a viewer-side bug so we'll try to mitigate it somewhere client-side
  => repro: teleport and then right-click to get an active selection => the attachment will get killed => at some point after it will reappear once the new region sends an update message for it

--HG--
branch : RLVa
2016-06-25 01:24:57 +02:00
Kitty Barnett 4747f6db42 [FIXED] The lookup map isn't populated when RLV_RELEASE is defined
-> RLV_ASSERT resolves to nothing

--HG--
branch : RLVa
2016-06-25 00:31:01 +02:00
Kitty Barnett aaedd151ce Code cleanup: don't store unknown or invalid restrictions/behaviours
--HG--
branch : RLVa
2016-06-25 00:28:40 +02:00
Kitty Barnett e4f327e747 Code cleanup: integrate some of the Firestorm changes/fixes so we don't wipe them out again
--HG--
branch : RLVa
2016-06-24 16:58:17 +02:00
Nicky 721a4a8c4c Updated crash-host 2016-06-23 22:21:24 +02:00
Ansariel 6e8e6ce0b4 enabled_control / disabled_control don't work properly with LLRadioGroup (additional fix) 2016-06-22 21:41:44 +02:00
Ansariel 50a547919f FIRE-10635: Fix crash on settings restore introduced by coroutine merge 2016-06-22 21:35:20 +02:00
Ansariel fe62d7cb16 Properly disabled namtag options that only affects the actual nametag in preferences -> General 2016-06-22 21:01:57 +02:00
Tonya Souther bd6cb9d054 Update curl for OS X. 2016-06-22 06:47:29 -05:00
Ansariel 52b008890c Format avatar complexity with thousands separator 2016-06-22 09:55:24 +02:00
Ansariel 8a3eeab32e Cleanup and sync LLPanelMainInventory 2016-06-22 08:55:36 +02:00
Tonya Souther 3fda523e9d 32-bit C++11 fixes. 2016-06-21 22:52:20 -05:00
Tonya Souther 9ba7b76034 32-bit C++11 fixes. 2016-06-21 22:52:20 -05:00
Tonya Souther 8961fbed74 Updating SLPlugin for OS X. 2016-06-21 17:18:37 -05:00
Tonya Souther cc4ef52b97 Build fixes for C++11 on OS X. Includes several rebuilt libraries. 2016-06-21 15:57:18 -05:00
Tonya Souther ebf13f9abc Build fixes for C++11 on OS X. Includes several rebuilt libraries. 2016-06-21 15:57:18 -05:00
Kitty Barnett 21d05e0204 Merged with RLVa tip 2016-06-25 02:05:47 +02:00
Kitty Barnett e4c1b08651 Merged with lgpl tip 2016-06-24 19:41:03 +02:00
Kitty Barnett 5cc4570d10 Merged with RLVa tip 2016-06-24 19:32:38 +02:00
Kitty Barnett 17a9b09f25 Reapply FS-specific changes 2016-06-24 17:18:38 +02:00
Kitty Barnett a21ad8481e Merged with RLVa update tip 2016-06-24 00:48:37 +02:00
Ansariel 3b8a3c08bb Use lighter grey if not limiting avatar complexity as LLColor4::grey is barely readable and optimize away else case 2016-06-21 21:57:25 +02:00