4296fe4286
Transplant changes made to keys.xml to keys_azerty.xml
2014-06-11 18:27:37 +02:00
2455a0a8e0
Replaced even deprecated logging macros.
2014-06-11 18:24:52 +02:00
2a735cd004
Dump additions to LLUrlDispatcher - we already transplanted MAINT-535 a while ago
2014-06-11 18:22:13 +02:00
8c1d26dfb7
Replace deprecated logging macros once again
2014-06-11 18:21:11 +02:00
a461052992
Add crash fix to LLTextureCacheRemoteWorker that got missing in a previous merge
2014-06-11 18:20:49 +02:00
5cb66a6511
Backout wrong fix for MAINT-3671 - this will be done by an upcoming change from LL anyway
2014-06-11 18:09:23 +02:00
006dd11e63
Clean up fix for recent inventory panel filter not persisting across relogs after filter get properly initialized with names again
2014-06-11 18:08:48 +02:00
2bbece0ee8
Re-adding missing statistics label
2014-06-11 15:23:45 +02:00
6db8c282f3
Make newer GCC versions happy about unitialized data.
2014-06-11 15:11:06 +02:00
21e360650c
Removed old code.
2014-06-11 15:10:20 +02:00
59dd65fc24
Lag Meter post-removal cleanup
...
- Clicking on the small lag meter indicators in upper right corner of the screen will now toggle Statistics floater instead of removed Lag Meter
- Invalid 'Lag Meter' entries removed from menus
2014-06-11 14:42:15 +02:00
6c6115168c
Removed duplicated entry in notifications.xml
2014-06-11 14:28:08 +02:00
d58684de21
Updated Polish translation after second merge
2014-06-11 14:22:32 +02:00
638954121f
Merge
2014-06-10 20:27:48 -07:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
8e2f975b62
Fix RelWithDebInfo compile breakage from merge.
2014-06-10 19:09:50 -07:00
344f62afd4
Localizability fixes in skin files
2014-06-11 03:27:31 +02:00
7b8490ae1a
Updated Polish translation after merge
2014-06-11 03:18:03 +02:00
e17a72d074
More fixes for float vs double.
2014-06-11 00:13:14 +02:00
91a67f3c6b
User proper float type for initialization.
2014-06-10 23:31:22 +02:00
5e54a93c9a
Pass properly casted arguments to RaiseException.
2014-06-10 23:16:46 +02:00
e0974593d3
Fix some 0-pointer crashes we got with last merge.
2014-06-10 22:42:21 +02:00
db68b4d7ea
Re-apply performance tweak in LLFlashTimer
2014-06-10 22:26:46 +02:00
d09fbe7498
Re-apply fix for FIRE-3925
2014-06-10 22:22:23 +02:00
8d9d6c00e2
Fix script count changes reporting
2014-06-10 22:13:29 +02:00
2f80838553
Fix merge issue in LLPanelPermissions
2014-06-10 21:55:08 +02:00
3b0cf7ef78
Fix merge error and derive LLFolderViewModelItem from FSFolderViewModelItem again.
2014-06-10 21:50:47 +02:00
d8e457d707
Fix merge error for LLPanelObject by exposing MAX_ATTACHMENT_DIST
2014-06-10 21:50:25 +02:00
bb2d6a7dea
Post-merge cleanup in llinventorymodel.cpp.
2014-06-10 21:38:45 +02:00
bcf5765864
Fix merge issue in RlvUtil
2014-06-10 21:32:06 +02:00
3aa2655f5e
Fix merge issue in LLDebugText
2014-06-10 21:27:30 +02:00
86f3e3f32e
Fix merge issue in LLWorld
2014-06-10 21:16:00 +02:00
f2794a46be
More merge fixes for LLVLManager
2014-06-10 21:01:29 +02:00
f47edb453c
Merge fix for LLVLManager
2014-06-10 20:56:54 +02:00
1fd6cbd906
Switch llpreviewscript.cpp to the new stats system.
2014-06-10 20:34:20 +02:00
029a8bf107
More post-merge love for llappviewer.
2014-06-10 20:25:04 +02:00
97ab789661
Merge fixes in LLAppViewer
2014-06-10 20:21:41 +02:00
cbf8525cfc
Post-merge fixes for llfloaterpreference.cpp.
2014-06-10 20:16:30 +02:00
1967bc4051
Merge fixes in LLViewerObject
2014-06-10 20:15:49 +02:00
b4e92f61af
lldrawpoolalpha post-merge fix.
2014-06-10 20:08:30 +02:00
c207f3b90c
Fix merge error in llconversationlog.cpp.
2014-06-10 20:00:34 +02:00
c7896e51ee
Fix merge errors in lllogchat.cpp.
2014-06-10 20:00:09 +02:00
8756164c3c
Fix merge error in LLViewerTextureList
2014-06-10 19:50:38 +02:00
d74467f64b
More post-merge fixes for inventory changes.
2014-06-10 19:46:01 +02:00
c952913ff3
Replace changes of LLInventoryModel::item_array_t being a vector now.
2014-06-10 19:42:37 +02:00
d08c416738
Apply renaming of handleVisibilityChange to onVisibilityChange to Firestorm floater and good morning LL for apparently overlooking the perform the change in LLAvatarListItem
2014-06-10 19:41:36 +02:00
4934c729df
Merge.
2014-06-10 19:22:48 +02:00
108cd80240
Fix merge error.
2014-06-10 19:19:39 +02:00
6a911a9e8a
Stats changes v2.
2014-06-10 19:19:22 +02:00
5e82671a10
Fix merge error in LLClassifiedStatsResponder
2014-06-10 19:17:26 +02:00
Ansariel