Melanie
|
13d635d1d7
|
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
|
2011-10-25 01:37:01 +01:00 |
Melanie
|
8e69dde397
|
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
|
2011-10-25 01:36:39 +01:00 |
Melanie
|
0b833c458a
|
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
|
2011-10-25 01:35:51 +01:00 |
Melanie
|
b8352c153b
|
Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmerge
|
2011-10-25 01:35:38 +01:00 |
Melanie
|
080a41e9f9
|
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
|
2011-10-25 01:35:30 +01:00 |
Melanie
|
5f025d20fe
|
Fix ground sit autopilot
|
2011-10-25 00:53:39 +02:00 |
Melanie
|
4a6160e7ad
|
Fake an AgentCircuitData if none is available rather than crashing out
|
2011-10-24 18:22:36 +02:00 |
Melanie
|
8cca9fe23c
|
Allow updating the movement animation while flying. This fixes falling,
splatting and ground sit. Walking to a ground sit still doesn't work.
|
2011-10-21 03:15:56 +02:00 |
Melanie
|
fd0e65b0b1
|
Fix up the animator and ScenePresence to like each other again
|
2011-10-20 23:11:53 +02:00 |
Justin Clark-Casey (justincc)
|
f5f7ca47ea
|
Bring LindenUDP.Tests back from the dead. No tests are running.
Code drift means that most of this stuff doesn't compile but the structure is still useful.
|
2011-10-12 21:31:22 +01:00 |
Justin Clark-Casey (justincc)
|
ea7366ddc6
|
When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting.
|
2011-10-12 19:42:04 +01:00 |
Justin Clark-Casey (justincc)
|
c5826d589a
|
minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks
|
2011-10-12 19:35:40 +01:00 |
Justin Clark-Casey (justincc)
|
36e73dbc9b
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2011-10-12 19:24:03 +01:00 |
Justin Clark-Casey (justincc)
|
f9ffd2538f
|
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
|
2011-10-12 19:22:30 +01:00 |
Melanie
|
35def547f7
|
Merge branch 'master' into bigmerge
|
2011-10-12 16:45:48 +01:00 |
Melanie
|
4b7b9e81f7
|
Make it possible to disable the HG linker. On non-HG systems it spits yellow
spam, so it should not load unless HG is desired.
|
2011-10-12 15:41:59 +01:00 |
Melanie
|
0faa8db0ef
|
Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled
by default) the config default. This way it will work for current cases while
allowing the use of other groups modules without config bloat.
|
2011-10-12 09:23:57 +01:00 |
Melanie
|
ca74088d94
|
Change default groups messaging module in hardcode to the empty string.
Modules should not assume thet they are the one and only, but only be
enabled when explicitly configured.
|
2011-10-12 09:21:46 +01:00 |
Melanie
|
c9fae6f8a2
|
Disable Flotsam groups messaging module in our config base
|
2011-10-12 09:27:48 +02:00 |
Melanie
|
d2dc2316c2
|
Merge branch 'master' into bigmerge
|
2011-10-12 09:26:35 +01:00 |
Melanie
|
1d379a9c7b
|
Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken
|
2011-10-12 07:46:13 +02:00 |
Melanie
|
e3effc4974
|
Merge branch 'master' into bigmerge
|
2011-10-12 07:29:35 +01:00 |
Melanie
|
4b069d23d0
|
Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge
|
2011-10-12 07:24:53 +01:00 |
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 |