Melanie
|
816d0de11a
|
Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge
|
2011-10-12 07:24:46 +01:00 |
|
Melanie
|
628ca122b8
|
Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge
|
2011-10-12 07:24:34 +01:00 |
|
Melanie
|
de109797f2
|
Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge
|
2011-10-12 07:24:26 +01:00 |
|
Melanie
|
cc637b78fb
|
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
|
2011-10-12 07:24:13 +01:00 |
|
Melanie
|
ad46ad1ab2
|
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
|
2011-10-12 07:23:54 +01:00 |
|
Melanie
|
98ae98510c
|
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
|
2011-10-12 07:23:40 +01:00 |
|
Melanie
|
5d3acc9ac3
|
Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge
|
2011-10-12 07:23:32 +01:00 |
|
Melanie
|
b716d98e23
|
Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge
|
2011-10-12 07:23:18 +01:00 |
|
Melanie
|
3657cd436c
|
Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge
|
2011-10-12 07:23:08 +01:00 |
|
Melanie
|
cc4b1c69d8
|
Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge
|
2011-10-12 07:23:02 +01:00 |
|
Melanie
|
3a290e581a
|
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
|
2011-10-12 07:09:41 +01:00 |
|
Melanie
|
1c67c13d77
|
Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge
|
2011-10-12 07:09:10 +01:00 |
|
Melanie
|
2c23fc9e68
|
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
|
2011-10-12 07:09:04 +01:00 |
|
Melanie
|
d03d486dbb
|
Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge
|
2011-10-12 07:08:46 +01:00 |
|
Melanie
|
2f6cc77154
|
Adjust CM version tag
|
2011-10-12 07:08:23 +01:00 |
|
Melanie
|
336f6f7ec4
|
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
|
2011-10-12 07:07:37 +01:00 |
|
Melanie
|
e2935c1bd4
|
Merge commit 'b5e6209cfd1c0b655852cf40e99f50aa2db9d8fa' into bigmerge
|
2011-10-12 07:07:23 +01:00 |
|
Melanie
|
4a284110e6
|
Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge
|
2011-10-12 07:07:12 +01:00 |
|
Melanie
|
8211169876
|
Merge commit '1c548179778befb50ee7481be7ffc91f2d53fede' into bigmerge
|
2011-10-12 07:07:05 +01:00 |
|
Melanie
|
492a50d6f7
|
Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge
|
2011-10-12 07:06:59 +01:00 |
|
Melanie
|
e18a76f6d6
|
Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge
|
2011-10-12 07:05:57 +01:00 |
|
Melanie
|
00285082d8
|
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
|
2011-10-12 07:05:47 +01:00 |
|
Melanie
|
9b4b022ecb
|
Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmerge
|
2011-10-12 07:05:39 +01:00 |
|
Melanie
|
abfb0c9399
|
Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge
|
2011-10-12 07:05:18 +01:00 |
|
Melanie
|
b251423b11
|
Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge
|
2011-10-12 07:04:28 +01:00 |
|
Melanie
|
65aed5f1d3
|
Merge commit '4c812884be59d76039afee74725fc45981356f36' into bigmerge
|
2011-10-12 07:04:06 +01:00 |
|
Melanie
|
86e28724bd
|
Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge
|
2011-10-12 07:03:58 +01:00 |
|
Melanie
|
265e9d094d
|
Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge
|
2011-10-12 07:02:36 +01:00 |
|
Melanie
|
b2090e711f
|
Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
2011-10-12 07:02:15 +01:00 |
|
Melanie
|
f4de1a6d9b
|
HACK: Remove advanced property resending until it is fixed properly in core.
|
2011-10-12 06:48:40 +02:00 |
|
Melanie
|
906df08ae6
|
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
|
2011-10-12 02:02:58 +01:00 |
|
Melanie
|
9733b64dc8
|
Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
2011-10-12 02:02:46 +01:00 |
|
Melanie
|
ba978d0d77
|
Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge
|
2011-10-12 01:43:52 +01:00 |
|
Melanie
|
4e88fe42e4
|
Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge
|
2011-10-12 01:42:39 +01:00 |
|
Melanie
|
5f2cb7caa3
|
Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmerge
|
2011-10-12 01:42:30 +01:00 |
|
Melanie
|
77f9d98831
|
Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
|
2011-10-12 01:41:59 +01:00 |
|
Melanie
|
d595f9fd85
|
Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge
|
2011-10-12 01:41:52 +01:00 |
|
Melanie
|
b0ee174296
|
Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge
|
2011-10-12 01:41:44 +01:00 |
|
Melanie
|
e68226afd3
|
Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge
|
2011-10-12 01:41:28 +01:00 |
|
Melanie
|
c0555f6be6
|
Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge
|
2011-10-12 01:39:38 +01:00 |
|
Melanie
|
2c03b6f0ae
|
Merge commit '38d205502a83ed334d9827f43862579cec305639' into bigmerge
|
2011-10-12 01:39:30 +01:00 |
|
Melanie
|
f5e78ca616
|
Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge
Conflicts:
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
|
2011-10-12 01:31:34 +01:00 |
|
Melanie
|
70fc130a49
|
Merge commit '9a49b3b5197f41353c32443dbc5432a4bcd58958' into bigmerge
|
2011-10-12 01:30:25 +01:00 |
|
Melanie
|
6af388ded9
|
Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge
|
2011-10-12 01:30:14 +01:00 |
|
Melanie
|
cd52f63b65
|
Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge
|
2011-10-12 01:30:07 +01:00 |
|
Melanie
|
30b2fc6aea
|
Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge
|
2011-10-12 01:29:47 +01:00 |
|
Melanie
|
f8016a730e
|
Merge commit '8a216dc1ccdc336a22958cd476de034d065cf676' into bigmerge
|
2011-10-12 01:29:37 +01:00 |
|
Melanie
|
e3f6344f54
|
Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge
|
2011-10-12 01:29:31 +01:00 |
|
Melanie
|
1ebfd2fb68
|
Fix tree populator
|
2011-10-12 01:55:12 +02:00 |
|
Melanie
|
59e3ac1ec6
|
Fix rezzing coalesced object broken by core merge
|
2011-10-12 00:50:13 +02:00 |