5e103f2b2e
Revert "Merge branch 'master' into careminster"
...
This reverts commit d49d44923d
2009-12-30 20:26:22 +00:00
d49d44923d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:25:57 +00:00
e6c71d6df6
* Fixes Sitting on the ground.
2009-12-30 15:55:49 -05:00
cbe0841bc9
Revert "Merge branch 'master' into careminster"
...
This reverts commit 596af3f600
2009-12-30 20:13:18 +00:00
596af3f600
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:12:21 +00:00
16a64c400b
* Makes forward and backward key reactions faster by responding to the NUDGE type movements.
2009-12-30 15:01:14 -05:00
2205d1c486
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-29 22:00:01 -05:00
25544ac04a
* Attempts to resolve the megaregion terrain edit rebound.
...
* It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue)
* While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good.
* This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
2009-12-29 21:59:19 -05:00
8f0d6d6b5c
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:37:28 +00:00
917fad40da
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:54 +00:00
a08360e3cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-30 00:27:34 +01:00
06f639b8f3
Fix a timer list locking issue causing XMREngine deadlocks
2009-12-30 00:27:01 +01:00
ba3dfe4121
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-29 18:42:30 +00:00
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
8ad8bd6282
Fix up the new Sirikata cient view
2009-12-27 17:52:27 +01:00
bca2afdb3c
One should not copy/paste so much :)
2009-12-27 16:08:12 +00:00
045a44b1af
One should not copy/paste so much :)
2009-12-27 16:07:59 +00:00
d321d23afe
Fix the spelling :/
2009-12-27 16:03:00 +00:00
3ec8e8e40b
Fix the spelling :/
2009-12-27 16:02:31 +00:00
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
58ad0ff315
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-27 15:47:58 +00:00
e063f0d592
Encode the published and mature checkboxes into the user flags for
...
profiles
2009-12-27 15:47:14 +00:00
4b96a78039
Merge branch 'master' into casper
2009-12-27 07:11:21 +01:00
19a5e606b3
Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ReaderWriteLockSlim, hopefully fixes a native crash
2009-12-27 07:08:16 +01:00
8a931a4e91
* Implements some basic Sirikata protocol work (initial handshakes).
2009-12-27 16:07:05 +11:00
8e18762e22
* Added prebuild for previous commit.
2009-12-27 15:03:26 +11:00
fd777cc7b9
* Implements Sirikata ClientStack Module
...
* Just a stub (imports all the sirikata protocol, and that's about it.)
2009-12-27 15:03:10 +11:00
763fa90be5
* Adding Google.ProtocolBuffers.dll dependency (BSD licensed)
...
* For some experimental work with a Sirikata clientstack.
2009-12-27 14:34:41 +11:00
a18f4964cf
Correct some issues with the last commit
2009-12-27 01:32:23 +01:00
b7951d5177
Correct some issues with the last commit
2009-12-26 23:57:49 +00:00
f5c310d9d4
Merge branch 'master' into careminster
2009-12-26 23:39:02 +00:00
0369256720
Close a SQL injection loophole in the new database driver
2009-12-26 23:38:11 +00:00
a6c93ce875
Make sure that we're not bounds checking attachments. 'Cos otherwise your hair will end up on your bum. Seen that before?
2009-12-26 22:55:18 +01:00
1b8f91a0db
Merge branch 'master' into casper
2009-12-26 18:17:55 +01:00
7371c7662a
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
2009-12-26 18:14:12 +01:00
f3a4860635
Merge branch 'master' into careminster
2009-12-26 04:13:27 +00:00
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
43c303e27a
Make the GenericTableHandler work as intended
2009-12-26 03:24:46 +01:00
92be01d5e6
Make the GenericTableHandler work as intended
2009-12-26 01:50:21 +00:00
e51be5f4a7
Merge branch 'master' into careminster
2009-12-26 00:21:03 +00:00
9972b12812
Add a generic REPLACE INTO handler for put into the generic table handler
2009-12-26 00:19:54 +00:00
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
e881f35fbb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-25 23:20:08 +00:00
59a841d69c
Merge branch 'master' into careminster
2009-12-25 23:17:08 +00:00
d5618fbcc3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-25 23:10:44 +00:00
8d36d7beed
Enable the profile module to be replaced completely, even for the base
...
profile data
2009-12-25 23:10:07 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
7a06ab834d
Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParams() - addresses Mantis #4462
2009-12-24 11:00:08 -08:00
Melanie