68ca12c093
Bypass Linux build errors for now. May need revisiting.
2013-07-10 09:10:20 -05:00
5ab34b6255
Merge fix fsdata.cpp
2013-07-10 07:05:54 -06:00
97db0a0cf2
Fix version string: We don't build a merge before committing and don't have two parents!
2013-07-10 14:08:42 +02:00
706b885155
More build fixes
2013-07-10 13:16:58 +02:00
82edb60993
Fix MD5 checksum for FmodEx for Windows
2013-07-10 11:59:04 +02:00
f81d31b0ca
Fix build script to properly pull FmodEx
2013-07-10 11:58:46 +02:00
c797878e42
Fix --chan argument to build command.
2013-07-10 04:08:31 -05:00
5ec8095c11
Merge
2013-07-10 00:24:04 -07:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
0f7baaa1ff
One more cleanup push for tonight.
2013-07-09 23:57:26 -06:00
750fb77d39
fix settings.xml
2013-07-09 20:33:02 -07:00
87b8bd6eb8
Clean out dead stuff from viewer_manifest.py and CmakeLists.txt, bump version back up to 4.5.0
2013-07-09 21:32:43 -06:00
4ce5358f89
Clean up build scripts post merge - Pass #1
2013-07-09 20:07:58 -06:00
fd33012318
include (BuildVersion) in new view
2013-07-09 19:26:07 -06:00
1059d154ed
Merge fix and update darwin 3p-boost
2013-07-09 18:58:46 -06:00
928a256643
Fixed German translation
2013-07-10 02:44:59 +02:00
b5cf7922a9
Merge
2013-07-09 17:01:19 -07:00
d65126cab6
Merge fix, use our plist
2013-07-09 17:53:19 -06:00
478de75a95
Merge
2013-07-09 16:48:18 -07:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
7416d71731
Don't call gAgent.isDoNotDisturb() several times on each IM message, assign it to BOOL first - and use instead
2013-07-09 09:28:32 +02:00
e61b0ec174
FIRE-8499 Update: Fix case where the name sometimes shows as (waiting) generate a SLapp instead of fetching from name cache.
2013-07-08 17:53:56 -06:00
8f8047c2e1
Updated German translation
2013-07-09 00:43:25 +02:00
1f45e40cf2
FIRE-10792: Updated Polish translation
2013-07-09 00:07:33 +02:00
e756c774ff
FIRE-10792: Customize function syntax highlighting
2013-07-08 15:45:55 -06:00
edba5789ea
Revert keywords.ini to stock ll for easier upstream merges
2013-07-08 15:04:03 -06:00
efe708ef12
One more time, a new format for script library xml:
...
*Do not use llsd-xml, use our new format
*Include constants and keywords in the script library, deprecate keywords.ini and remove parsing it
*Readd energy and sleep time values
*Minor bug fixes in llpreviewscript.cpp
2013-07-08 15:01:25 -06:00
75a9894ce1
Attempt to fix nametag not properly updating when display name arrives
2013-07-08 21:20:51 +02:00
5fdce4830d
Removed duplicated settings entries by using automated PHP script to find them and manually deleting
2013-07-08 19:59:29 +02:00
48028a6f07
Fixed UI Sounds logic for IMs; Removed unnecessary "PlaySoundNewConversation" debug setting, we have our own checks for that since 4.3.0
2013-07-08 18:51:05 +02:00
0dc158443f
Re-apply FIRE-9506 crashfix: linked_item is null in case of temporary attachments. Also rlvPredCanRemoveItem will return false, so you wouldn't be able to detach it if RLVa is enabled.
2013-07-08 17:43:35 +02:00
c0450ad230
More code cleanup
2013-07-08 17:23:17 +02:00
7a89e64106
Re-instated our code for autoresponse feature
2013-07-08 17:22:52 +02:00
8258290f10
Fixed SSA merge issue in llsaveoutfitcombobtn.cpp
2013-07-08 17:22:04 +02:00
3e88d62b78
More CHUI merge issue cleanup
2013-07-08 14:58:41 +02:00
64b001cda3
Fix some more CHUI merge issues including old merge bug in llavatarlist.cpp
2013-07-08 14:19:57 +02:00
3020a19cbd
Some code cleanup and adding of FS code tags
2013-07-08 13:41:13 +02:00
b4f22bd993
Fix merge issue in llavataractions.cpp
2013-07-08 13:39:49 +02:00
fa4d707276
Fixed another merge issue in llsidepanelappearance.cpp
2013-07-08 12:23:53 +02:00
815300bba3
Fixed SSA merge issue in llsaveoutfitcombobtn.cpp
2013-07-08 17:22:04 +02:00
c373e7d91e
Fixed another merge issue in llsidepanelappearance.cpp
2013-07-08 12:23:53 +02:00
ec85208c92
Fixed bad merge in llvoavatar.cpp
2013-07-08 12:03:47 +02:00
236663e9bf
Merge
2013-07-08 00:15:34 -07:00
4179ba4400
Restored nearby_voice_monitor control since crash bug has been fixed
2013-07-08 00:14:40 -07:00
270c05e1d8
Added some comments to mark our code in LLAvatarListItem
2013-07-08 03:15:23 +02:00
c4d24b8136
Tied chat console size limits to snap edges with FSLegacyEdgeSnap
2013-07-07 18:01:45 -07:00
bd6dc4bc55
Removed usless button from profile
2013-07-07 18:00:22 -07:00
1c22cc9c1e
Fix German translation for nearby/friends gear menu in people panel
2013-07-08 02:58:49 +02:00
ce053595dd
Adjusted inventory item height to better fit selection boundry
2013-07-07 17:57:52 -07:00
Tonya Souther