Commit Graph

651 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Oz Linden f92fd78e74 merge changes for storm-1790 2012-01-04 10:46:12 -05:00
Oz Linden 988cb62d43 merge changes for storm-1727 2012-01-04 10:11:59 -05:00
Oz Linden d0c7eaa7cf merge changes for storm-1725 2012-01-04 09:33:50 -05:00
Oz Linden 97630acce0 merge changes for storm-1708 2012-01-04 09:32:38 -05:00
Jonathan Yap 8a3aa3f6ca STORM-1790 Provide a Develop sub-menu to change the default logging level
co-authored with Zi Ree
2011-12-23 12:06:36 -05:00
Oz Linden b022ebf13c merge changes for storm-1734 2011-12-20 10:39:06 -05:00
Oz Linden 2667c6a80f merge changes for storm-653 and storm-1737 2011-12-20 09:20:36 -05:00
Oz Linden a336f1ee39 merge changes for storm-1737 2011-12-19 13:16:01 -05:00
Jonathan Yap 5226629883 STORM-1737 panel_edit_skin.xml uses confusing historical terminology 2011-12-18 10:29:05 -05:00
Jonathan Yap 399bd5643c STORM-653 As a user i would like to be able to see the available number of attachments and remaining free slots. 2011-12-17 13:27:20 -05:00
Oz Linden 94673473ed merge changes for storm-1653 2011-12-15 16:06:08 -05:00
Oz Linden 916c4a79e5 merge changes for storm-1731 2011-12-15 16:05:26 -05:00
Oz Linden c0f5b24b54 merge changes for storm-1723 2011-12-15 16:04:40 -05:00
Oz Linden 1b6ee87bc8 merge changes for storm-1733 2011-12-15 16:03:34 -05:00
Alissa Sabre 6df5dfc0da storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Alissa Sabre a94a923240 storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Jonathan Yap 821c964230 STORM-1736 Cropped buttons in the bottom of the Ad-hoc floater 2011-12-14 17:44:10 -05:00
Jonathan Yap fdc223287c STORM-1734 Update contributions.txt with Storm jira number 2011-12-14 13:58:46 -05:00
Jonathan Yap eb7b43fb55 STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but has no shortcut 2011-12-14 13:21:48 -05:00
Jonathan Yap 7f85f6be6a VWR-27832 L$ Transfer failures show alert as if successful 2011-12-12 20:07:34 -05:00
Jonathan Yap a03b3aaa60 STORM-1731 Ad-hoc confererence block failing. Residents using it to start massive multi-sim conferences, used as a griefing tool. 2011-12-12 08:51:16 -05:00
Oz Linden 7457a3eb7a merge changes for vmrg-199 2011-12-07 14:49:27 -05:00
Oz Linden cbfec00c6e merge changes for storm-1713 2011-12-06 14:00:22 -05:00
Oz Linden 4a0311f8c5 merge changes for storm-1712 2011-12-06 13:53:37 -05:00
Oz Linden f54caff1e4 merge changes for storm-591 2011-12-06 13:52:26 -05:00
Jonathan Yap fc671fa2b3 STORM-1728 Name truncation in the Region/Estate floater -> Covenant tab 2011-12-06 10:41:22 -05:00
Jonathan Yap a78894285a STORM-1725 Truncation of UI element Preferences->General->Busy mode response 2011-12-06 10:03:26 -05:00
Jonathan Yap b89c1ac482 STORM-1727 Dates displayed incorrectly in group profile. year "2035" 2011-12-06 09:53:09 -05:00
Ansariel 1e2d424f9e STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item 2011-12-05 23:35:29 +01:00
Jonathan Yap 6e2b3fd634 STORM-1712 Do not sort recent speakers list if mouse is hovered over it 2011-12-02 18:48:43 -05:00
Ansariel Hiller 9a79b6f330 storm-1717: fix avatar names in object details floater 2011-12-02 14:37:23 -05:00
Oz Linden 34b44fe714 merge changes for storm-1719 2011-12-01 13:27:27 -05:00
Jonathan Yap 47e493f5f8 STORM-1721 Set UI Size to Default Option Duplicated in Advanced Menu 2011-12-01 09:49:06 -05:00
Jonathan Yap 93dbcb4dc8 STORM-1719 notifications.xml has two instances where a button shows as "Ok" and Not "OK" 2011-11-30 05:26:07 -05:00
Oz Linden d22584bfe5 merge changes for vmrg-193 2011-11-28 11:02:15 -05:00
Brad Payne (Vir Linden) 5374e544ed merge 2011-11-28 10:13:34 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Oz Linden e93b5b0d22 merge changes for storm-1684 2011-11-21 09:20:49 -05:00
Tofu Buzzard b901998c6f Add "Use Region Settings" to World->Sun menu 2011-11-21 09:20:09 -05:00
Oz Linden 052d8a8f2e merge changes for storm-1679 2011-11-21 09:11:01 -05:00
Ima Mechanique b28492fbff STORM-1708 Adding ability to save/load scripts from file. 2011-11-17 23:17:26 +00:00
Ansariel Hiller bdb27b7e81 STORM-1685 Wrong named control in floater_world_map.xml
Patch converted to hg format by Jonathan Yap.
2011-11-11 14:13:56 -05:00
Oz Linden 281fde3c48 merge changes for storm-1105 2011-11-08 14:08:01 -05:00
Oz Linden d3eb5ac875 merge changes for storm-1222 2011-11-08 14:07:04 -05:00
Oz Linden 49f2c4f78a merge changes for storm-1674 2011-11-08 14:05:16 -05:00
Oz Linden 450dc71396 merge changes for storm-1659 2011-11-08 14:04:17 -05:00
Jonathan Yap 089a9ced0d STORM-1679 Avatar Draw Weight number is always red 2011-11-03 08:25:34 -04:00
Dave Parks 55f69de90c merge 2011-11-02 11:46:18 -05:00
Jonathan Yap 403cdb863d STORM-1222 System message when trying to teleport back to Welcome Island isn´t localized 2011-10-28 22:04:20 -04:00