54e6c26def
Merge branch 'master' into careminster
2010-01-04 22:29:43 +00:00
ab0dfbc163
Update SQlite to newest
2010-01-04 22:24:01 +00:00
1ae9bfc074
Finish conversion if XInventoryService
2010-01-04 20:53:28 +00:00
e76333555d
First stage port of the XInventoryService
2010-01-04 20:53:26 +00:00
0907d5d69e
Finish conversion if XInventoryService
2010-01-04 20:52:44 +00:00
53d3f46add
First stage port of the XInventoryService
2010-01-04 18:47:47 +00:00
d657b76dba
Merge branch 'master' into careminster
2010-01-04 06:17:38 +00:00
3740775472
When rezzing a no-copy object on a no-rez parcel, the object vanishes from
...
inventory until relog. This patch corrects this and puts the item back into
inventory.
2010-01-04 06:16:04 +00:00
f198c68547
Mark GetUserInventory as obsolete. It is still used in the default
...
avatars module and in the REST inventory service, but future inventory
services and/or connector will not include this method anymore, because
it is dangerous on large inventory servers. Marking as obsolete to give
an incentive to rewrite these services to use the recursive fetching
or more targeted retrieval.
2010-01-04 05:34:32 +00:00
1121919b57
Solve conflict
2010-01-03 22:02:36 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
e69ec1108f
Cause llSetText to send prim updates.
2010-01-03 21:42:22 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
71fdc24f5c
Add virtual method StateChange to ScriptBaseClass
2010-01-02 21:21:31 +01:00
9f273717a2
Add virtual method StateChange to ScriptBaseClass
2010-01-02 19:43:54 +00:00
0d9591bf35
Prevent the creation of duplicate inventory folders in the case of a login
...
database issue. Now the login will instaead fail later.
2010-01-01 22:51:00 +00:00
61f63fdc38
Put PassCollision on the ignore list for testing, since we don't save that
...
yet.
2009-12-31 23:51:53 +00:00
aa51b83fdc
Merge branch 'master' into careminster
2009-12-31 23:31:45 +00:00
3ec502f551
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 23:29:32 +00:00
b321c0a932
Merge branch 'master' into careminster
2009-12-31 21:53:39 +00:00
004c751a1b
Whitespace cleanup (changed hard tabs to 4 spaces)
2009-12-31 21:36:04 +00:00
8ca37dbefa
Adds Friend Finding functionality.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:31:04 +00:00
234d4e1105
Adds tons of packets.
...
Applied with change: Changed spelling to Summary (from Summery)
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:24:56 +00:00
67cfe34e67
Merge branch 'master' into careminster
2009-12-31 06:42:33 +00:00
9c4e6f060a
This patch caused serialization errors and needs to be reexamined
...
Revert "[PATCH] Adds llCollisionFilter"
This reverts commit eab2b4c6a9
2009-12-31 06:41:10 +00:00
643cc7a0ee
Merge branch 'master' into careminster
2009-12-31 04:53:05 +00:00
b3cb99036c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-31 06:21:03 +01:00
9602227eb6
Add a small delay in NewAgentConnection to fix an issue with Hippo
...
(and possibly other cleints) getting their data mixed up.
2009-12-31 06:20:35 +01:00
eab2b4c6a9
[PATCH] Adds llCollisionFilter
...
Thank you, Revolution. Applied with minor changes.
2009-12-31 04:48:59 +00:00
87959464c9
Adds osKickUser and osSetSpeed
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 03:56:55 +00:00
e6c71d6df6
* Fixes Sitting on the ground.
2009-12-30 15:55:49 -05:00
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
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
Melanie