Nicky
|
e0974593d3
|
Fix some 0-pointer crashes we got with last merge.
|
2014-06-10 22:42:21 +02:00 |
|
Ansariel
|
db68b4d7ea
|
Re-apply performance tweak in LLFlashTimer
|
2014-06-10 22:26:46 +02:00 |
|
Ansariel
|
d09fbe7498
|
Re-apply fix for FIRE-3925
|
2014-06-10 22:22:23 +02:00 |
|
Ansariel
|
8d9d6c00e2
|
Fix script count changes reporting
|
2014-06-10 22:13:29 +02:00 |
|
Ansariel
|
2f80838553
|
Fix merge issue in LLPanelPermissions
|
2014-06-10 21:55:08 +02:00 |
|
Nicky
|
3b0cf7ef78
|
Fix merge error and derive LLFolderViewModelItem from FSFolderViewModelItem again.
|
2014-06-10 21:50:47 +02:00 |
|
Ansariel
|
d8e457d707
|
Fix merge error for LLPanelObject by exposing MAX_ATTACHMENT_DIST
|
2014-06-10 21:50:25 +02:00 |
|
Nicky
|
bb2d6a7dea
|
Post-merge cleanup in llinventorymodel.cpp.
|
2014-06-10 21:38:45 +02:00 |
|
Ansariel
|
bcf5765864
|
Fix merge issue in RlvUtil
|
2014-06-10 21:32:06 +02:00 |
|
Ansariel
|
3aa2655f5e
|
Fix merge issue in LLDebugText
|
2014-06-10 21:27:30 +02:00 |
|
Ansariel
|
86f3e3f32e
|
Fix merge issue in LLWorld
|
2014-06-10 21:16:00 +02:00 |
|
Ansariel
|
f2794a46be
|
More merge fixes for LLVLManager
|
2014-06-10 21:01:29 +02:00 |
|
Ansariel
|
f47edb453c
|
Merge fix for LLVLManager
|
2014-06-10 20:56:54 +02:00 |
|
Nicky
|
1fd6cbd906
|
Switch llpreviewscript.cpp to the new stats system.
|
2014-06-10 20:34:20 +02:00 |
|
Nicky
|
029a8bf107
|
More post-merge love for llappviewer.
|
2014-06-10 20:25:04 +02:00 |
|
Ansariel
|
97ab789661
|
Merge fixes in LLAppViewer
|
2014-06-10 20:21:41 +02:00 |
|
Nicky
|
cbf8525cfc
|
Post-merge fixes for llfloaterpreference.cpp.
|
2014-06-10 20:16:30 +02:00 |
|
Ansariel
|
1967bc4051
|
Merge fixes in LLViewerObject
|
2014-06-10 20:15:49 +02:00 |
|
Nicky
|
b4e92f61af
|
lldrawpoolalpha post-merge fix.
|
2014-06-10 20:08:30 +02:00 |
|
Nicky
|
c207f3b90c
|
Fix merge error in llconversationlog.cpp.
|
2014-06-10 20:00:34 +02:00 |
|
Nicky
|
c7896e51ee
|
Fix merge errors in lllogchat.cpp.
|
2014-06-10 20:00:09 +02:00 |
|
Ansariel
|
8756164c3c
|
Fix merge error in LLViewerTextureList
|
2014-06-10 19:50:38 +02:00 |
|
Nicky
|
d74467f64b
|
More post-merge fixes for inventory changes.
|
2014-06-10 19:46:01 +02:00 |
|
Nicky
|
c952913ff3
|
Replace changes of LLInventoryModel::item_array_t being a vector now.
|
2014-06-10 19:42:37 +02:00 |
|
Ansariel
|
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 |
|
Nicky
|
4934c729df
|
Merge.
|
2014-06-10 19:22:48 +02:00 |
|
Nicky
|
108cd80240
|
Fix merge error.
|
2014-06-10 19:19:39 +02:00 |
|
Nicky
|
6a911a9e8a
|
Stats changes v2.
|
2014-06-10 19:19:22 +02:00 |
|
Ansariel
|
5e82671a10
|
Fix merge error in LLClassifiedStatsResponder
|
2014-06-10 19:17:26 +02:00 |
|
Ansariel
|
386b58944c
|
More replacements of deprecated logging macros
|
2014-06-10 19:15:47 +02:00 |
|
Nicky
|
3e299bee08
|
Changes to use the new stats system.
|
2014-06-10 19:04:04 +02:00 |
|
Tank_Master
|
18e524b501
|
remove unreachable include
|
2014-06-10 08:06:14 -07:00 |
|
Tank_Master
|
6095a2072d
|
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
|
2014-06-10 08:01:16 -07:00 |
|
Tank_Master
|
8ae6d589dc
|
64bit compile fix
|
2014-06-10 07:35:42 -07:00 |
|
Nicky
|
a7f69863d1
|
Post-Merge clean sweep.
|
2014-06-10 16:27:50 +02:00 |
|
Nicky
|
2b8cc81ff5
|
Get all those new LLUnits play nicely with each other.
|
2014-06-10 16:11:24 +02:00 |
|
Nicky
|
dfa515e7a5
|
Make GCC happy by removing () after ifdef.
|
2014-06-10 16:10:42 +02:00 |
|
Nicky
|
6128f59788
|
Post-Merge sweep. Remove operator new/delete.
|
2014-06-10 16:10:10 +02:00 |
|
Nicky
|
eebe42abc5
|
Add include for LLThread.
|
2014-06-10 16:09:15 +02:00 |
|
Nicky
|
c02a4f1db0
|
We need CRASH_SETTINGS_FILE in llapviewer too.
|
2014-06-10 13:56:19 +02:00 |
|
Nicky
|
84a7cb9f5a
|
More GCC happyness.
|
2014-06-10 13:55:46 +02:00 |
|
Nicky
|
6db3a5d6dc
|
Post-Merge sweep over LLSpatialPartition.
|
2014-06-10 13:49:40 +02:00 |
|
Nicky
|
e3e3fd917f
|
Post-Merge: make getPartSourceScript() / getPhysicsShapeUnknown() public again.
|
2014-06-10 13:39:03 +02:00 |
|
Nicky
|
4b15d68a2e
|
Add include for gDisconnected.
|
2014-06-10 13:20:52 +02:00 |
|
Nicky
|
e8048406f4
|
Correct some more merge errors with LL_DEBUGS
|
2014-06-10 13:07:23 +02:00 |
|
Nicky
|
a7111940bc
|
Replace childSetText with childSetValue and add missing includes for LLViewerRegion.
|
2014-06-10 12:34:16 +02:00 |
|
Nicky
|
cef556c152
|
More correction in llplugin ...
|
2014-06-10 11:23:07 +02:00 |
|
Nicky
|
9c7ab535d4
|
Adjust for changes in LLUI after merge,
|
2014-06-10 11:17:28 +02:00 |
|
Nicky
|
46f4e82aab
|
Workaround for broken code after merge.
|
2014-06-10 11:06:00 +02:00 |
|
Nicky
|
4a38a5b528
|
Use LL's code for ::updateClass (LLInstanceTracker functions) again.
|
2014-06-10 11:03:33 +02:00 |