Cinders
|
e50e4b330d
|
Fix more merge regressions, update code to use updated UserLoginInfo setting
|
2013-08-29 15:09:26 -06:00 |
|
Cinders
|
c121977038
|
Merge up llstartup.* with LL release, no significant code change
|
2013-08-29 09:52:52 -06:00 |
|
Cinders
|
fa0500013f
|
Insert missing string
|
2013-08-29 09:17:17 -06:00 |
|
Ansariel Hiller
|
ee6626aa7b
|
Remove duplicated group eject notifications in German translation
|
2013-08-28 21:42:42 +00:00 |
|
Cinders
|
bb569a17f8
|
Remove duplicate EjectGroup members notifications
|
2013-08-28 15:32:03 -06:00 |
|
Cinders
|
767b22ffca
|
Merge fix, use my snowstorm version of FIRE-8499 fix
|
2013-08-28 15:20:07 -06:00 |
|
Cinders
|
edc1127dbd
|
Merge fix: Allow threaded history loading in conversation preview
|
2013-08-28 15:19:10 -06:00 |
|
Ansariel
|
b428e50b99
|
Include remove friend agent slurl context menu option also in scroll list control
|
2013-08-28 23:02:01 +02:00 |
|
Ansariel
|
a9258d9510
|
Add enable check for remove friend option in agent slurl context menu
|
2013-08-28 22:41:18 +02:00 |
|
Ansariel
|
d83f3eace3
|
Updated German translation
|
2013-08-28 21:50:04 +02:00 |
|
Ansariel
|
e34413a6e4
|
Add "go to line" menu option to preproc-enabled script editor panel
|
2013-08-28 21:48:47 +02:00 |
|
Ansariel
|
5a07e26161
|
Fix some issues in English locale
|
2013-08-28 21:48:27 +02:00 |
|
Ansariel
|
209ccdd35d
|
Fix merge issue in rlvextensions.cpp with help from Kitty
|
2013-08-28 20:41:25 +02:00 |
|
Ansariel
|
07f076165f
|
Cleanup LLFloaterConversationPreview
|
2013-08-28 19:58:23 +02:00 |
|
Ansariel
|
c65e6fc286
|
Clear merge issue in llagent.cpp & llfloaterpreference.cpp
|
2013-08-28 19:57:53 +02:00 |
|
Ansariel
|
414507c1d6
|
Clear open merge issue in FSFloaterNearbyChat
|
2013-08-28 19:32:14 +02:00 |
|
Ansariel
|
2d178f9863
|
Remove now duplicate registration of Url.SendIM commit function in LLTextBase
|
2013-08-28 19:26:54 +02:00 |
|
Tank_Master
|
f52e527db2
|
Merge LGPL
|
2013-08-28 00:12:24 -07:00 |
|
Tank_Master
|
5a8d94c50f
|
Merge LL 3.6.4 pass 1
|
2013-08-28 00:10:39 -07:00 |
|
Cinders
|
670534c7c8
|
Add collada export to menus and pies I'd forgotten
|
2013-08-27 20:21:16 -06:00 |
|
PanteraPolnocy
|
b7dd400a43
|
Restoring localizability for "RLV support will be xxx after restart" message in Preferences
|
2013-08-28 04:13:21 +02:00 |
|
Tonya Souther
|
d002aa3335
|
Change Export to Save in pie menus for consistency.
|
2013-08-27 21:10:16 -05:00 |
|
Cinders
|
c062fdc282
|
Don't give the option to export objects if no objects are selected
|
2013-08-27 19:56:38 -06:00 |
|
Tonya Souther
|
04744ff5c4
|
Make import linkset menu item consistent with others.
|
2013-08-27 20:45:56 -05:00 |
|
Tonya Souther
|
c0d8d83b32
|
Hide temporary upload checkbox if uploads are free or SSA is in use.
|
2013-08-27 20:41:39 -05:00 |
|
PanteraPolnocy
|
b5af2df08c
|
FIRE-4322: The "bing" system sound missing - patch provided by Siren Bellic
|
2013-08-28 02:55:37 +02:00 |
|
Tonya Souther
|
239426a9b5
|
gcc 4.6 compile fixes.
|
2013-08-27 19:25:17 -05:00 |
|
PanteraPolnocy
|
673f31ae5f
|
Updated Polish translation (exporter)
|
2013-08-28 02:15:48 +02:00 |
|
Cinders
|
3551f5609c
|
Damn you autocorrect! That should have said 'dae export'. :-/
|
2013-08-27 17:58:54 -06:00 |
|
Cinders
|
f6628f47e1
|
Add Collada dad export with permission from Latif Khalifa of Singularity, with modifications
|
2013-08-27 17:49:30 -06:00 |
|
PanteraPolnocy
|
84d6178e4b
|
FIRE-9800: Update to README-linux.txt by Mister Acacia
|
2013-08-28 01:42:17 +02:00 |
|
PanteraPolnocy
|
ac2bf2a6b6
|
FIRE-11182: Translation in Estate Tools > Terrain displaying different required texture size values
Originally found by PixelProphet
|
2013-08-28 01:30:44 +02:00 |
|
Kool
|
bbe9734df3
|
Spanish translation: Add untracked file and delete a no longer needed one
|
2013-08-27 22:33:12 +02:00 |
|
Kool
|
00d699c2a9
|
Spanish translation update
|
2013-08-27 22:31:27 +02:00 |
|
Ansariel
|
b058bbe31b
|
Fix XML syntax error in German pie menus
|
2013-08-27 22:01:23 +02:00 |
|
PanteraPolnocy
|
17cf371e26
|
Updated Polish translation
|
2013-08-27 21:52:59 +02:00 |
|
Ansariel
|
e94f8f8b00
|
Synchronize llviewertexture.cpp with LL V3
|
2013-08-27 20:17:25 +02:00 |
|
Ansariel
|
e4bb6492c2
|
Added missing German tooltip translation for panel_group_roles.xml
|
2013-08-27 20:04:54 +02:00 |
|
Ansariel
|
8f2ac19d2b
|
Fix text in ability lists on group profile getting cut off
|
2013-08-27 19:58:48 +02:00 |
|
Ansariel
|
734de3dc27
|
Updated German translation
|
2013-08-27 19:44:53 +02:00 |
|
Ansariel
|
1785f72360
|
Revert to generic "Mute" in pie menus - it will be set in code anyway and would also lead to confusion with unblock option
|
2013-08-27 19:32:18 +02:00 |
|
Ansariel
|
ebf29c546f
|
Merge
|
2013-08-27 19:15:01 +02:00 |
|
Ansariel
|
da9695aa24
|
Expose new RenderDepthOfFieldInEditMode setting in preferences -> graphics -> depth of field
|
2013-08-27 19:14:40 +02:00 |
|
Ansariel
|
906c96c914
|
Add mute particle option to pie menus
|
2013-08-27 19:02:47 +02:00 |
|
Ansariel
|
51b57010ba
|
Remove now obsolete sculpt discard level clamping
|
2013-08-27 18:46:36 +02:00 |
|
Ansariel
|
c1583e1a94
|
Adjust FSMeshRequestTimeout because of MAINT-2347
|
2013-08-27 18:43:12 +02:00 |
|
PanteraPolnocy
|
b4510c55bb
|
Updated Polish translation, tool tip adjustement in Italian one
|
2013-08-27 18:41:50 +02:00 |
|
Tank_Master
|
6bbcac159b
|
Merge
|
2013-08-27 08:56:43 -07:00 |
|
Tank_Master
|
240aaf81b7
|
VS compile fix
|
2013-08-27 08:55:29 -07:00 |
|
Cinders
|
24d2dd5ba6
|
Fix build
|
2013-08-27 08:41:13 -06:00 |