Melanie
|
95a1a804bf
|
Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge
|
2011-10-11 23:15:29 +01:00 |
|
Melanie
|
ae67eb0a1f
|
Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge
|
2011-10-11 23:15:17 +01:00 |
|
Melanie
|
ae8504f8d9
|
Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge
|
2011-10-11 23:15:00 +01:00 |
|
Melanie
|
20a2b5d63c
|
Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge
|
2011-10-11 23:14:54 +01:00 |
|
Melanie
|
d1e681f682
|
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
|
2011-10-11 23:14:23 +01:00 |
|
Melanie
|
61a8e35b7d
|
Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge
|
2011-10-11 23:08:38 +01:00 |
|
Melanie
|
b9826035f6
|
Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge
|
2011-10-11 23:08:18 +01:00 |
|
Melanie
|
a157fdedcf
|
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
|
2011-10-11 23:08:07 +01:00 |
|
Melanie
|
66c06c5685
|
Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge
|
2011-10-11 23:02:19 +01:00 |
|
Melanie
|
ea8350a526
|
Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge
|
2011-10-11 23:02:04 +01:00 |
|
Melanie
|
5536cdf90c
|
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
|
2011-10-11 23:01:52 +01:00 |
|
Melanie
|
ed1bb2081e
|
Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge
|
2011-10-11 22:54:03 +01:00 |
|
Melanie
|
308b6937ad
|
Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge
|
2011-10-11 22:53:53 +01:00 |
|
Melanie
|
d8b78ca498
|
Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge
|
2011-10-11 22:53:38 +01:00 |
|
Melanie
|
fbe9216695
|
Merge commit 'def74404f1ea6b2a0f479c602fd67bcfced41426' into bigmerge
|
2011-10-11 22:53:30 +01:00 |
|
Melanie
|
83ec064868
|
Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
2011-10-11 22:53:27 +01:00 |
|
Melanie
|
1b2849319c
|
Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge
|
2011-10-11 22:52:15 +01:00 |
|
Melanie
|
b40157fc9b
|
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
|
2011-10-11 22:51:44 +01:00 |
|
Melanie
|
7c897ef2a1
|
Merge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmerge
|
2011-10-11 22:45:21 +01:00 |
|
Melanie
|
75fd256ef8
|
Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge
|
2011-10-11 22:43:27 +01:00 |
|
Melanie
|
2048976a6e
|
Merge commit '28a482a7ee2cebab1aa720477af175d7e26d702e' into bigmerge
|
2011-10-11 22:43:01 +01:00 |
|
Melanie
|
833420e167
|
Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge
|
2011-10-11 22:42:51 +01:00 |
|
Melanie
|
652c59c0a9
|
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
|
2011-10-11 22:42:18 +01:00 |
|
Melanie
|
2e47d24832
|
Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
2011-10-11 22:41:51 +01:00 |
|
Melanie
|
a671fcfd2c
|
Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge
|
2011-10-11 22:33:58 +01:00 |
|
Melanie
|
e3450da66c
|
Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
2011-10-11 22:33:53 +01:00 |
|
Melanie
|
67e7f25d6c
|
Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge
|
2011-10-11 22:32:21 +01:00 |
|
Melanie
|
6101de2316
|
Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
2011-10-11 22:32:10 +01:00 |
|
Melanie
|
9935eb6578
|
Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge
|
2011-10-11 22:26:18 +01:00 |
|
Melanie
|
a4ba99f020
|
Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge
|
2011-10-11 22:25:03 +01:00 |
|
Melanie
|
6e6c70be15
|
Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge
|
2011-10-11 22:24:40 +01:00 |
|
Melanie
|
1ba53850b2
|
Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge
|
2011-10-11 22:23:40 +01:00 |
|
Melanie
|
34954172a1
|
Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge
|
2011-10-11 22:23:16 +01:00 |
|
Melanie
|
36ec9f0e94
|
Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge
|
2011-10-11 22:22:49 +01:00 |
|
Melanie
|
b9de3b7f5b
|
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
|
2011-10-11 22:22:34 +01:00 |
|
Justin Clark-Casey (justincc)
|
fe3594c5ea
|
Start recording object updates per second statistic (analogue of agent updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor
A useful diagnostic to find out how object updates are burdening a scene
|
2011-10-11 22:17:05 +01:00 |
|
Melanie
|
071c3fe721
|
Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge
|
2011-10-11 22:15:44 +01:00 |
|
Melanie
|
03d533dc1e
|
Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge
|
2011-10-11 22:15:25 +01:00 |
|
Melanie
|
45ce8db5db
|
Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge
|
2011-10-11 22:14:17 +01:00 |
|
Melanie
|
341efb0942
|
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
|
2011-10-11 22:12:25 +01:00 |
|
Melanie
|
68a42af30f
|
Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge
|
2011-10-11 22:11:55 +01:00 |
|
Melanie
|
6978ae0a59
|
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
2011-10-11 22:11:44 +01:00 |
|
Melanie
|
117d24be54
|
Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge
|
2011-10-11 21:45:01 +01:00 |
|
Melanie
|
634fbca6bb
|
Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge
|
2011-10-11 21:41:46 +01:00 |
|
Melanie
|
a8747b3888
|
Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge
|
2011-10-11 21:41:30 +01:00 |
|
Melanie
|
189f766b8b
|
Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmerge
|
2011-10-11 21:32:49 +01:00 |
|
Melanie
|
f1fa059b37
|
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
|
2011-10-11 21:32:24 +01:00 |
|
Melanie
|
3ac15c03b2
|
Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge
|
2011-10-11 21:32:14 +01:00 |
|
Melanie
|
0fa21b7b5e
|
Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge
|
2011-10-11 21:31:48 +01:00 |
|
Melanie
|
673886d231
|
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
|
2011-10-11 21:30:42 +01:00 |