aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-01-0711-1/+766
|\
| * Allow estate managers (if estate_owner_is_god is set) to actually enterMelanie2010-01-051-1/+4
| | | | | | | | | | | | god mode. Allow god modification of objects if the object owner is the same god that wants to modify, this allows you to regain perms on your own objects after IAR import messed them up.
| * Merge branch 'master' into careminsterMelanie2010-01-044-0/+0
| |\
| | * Update SQlite to newestMelanie2010-01-044-0/+0
| | |
| | * Finish conversion if XInventoryServiceMelanie2010-01-043-19/+98
| | |
| | * First stage port of the XInventoryServiceMelanie2010-01-044-0/+674
| | |
| * | Finish conversion if XInventoryServiceMelanie2010-01-043-19/+98
| | |
| * | First stage port of the XInventoryServiceMelanie2010-01-044-0/+674
| | |
| * | Merge branch 'master' into careminsterMelanie2010-01-042-0/+9
| |\ \ | | |/
| | * When rezzing a no-copy object on a no-rez parcel, the object vanishes fromMelanie2010-01-041-0/+7
| | | | | | | | | | | | | | | inventory until relog. This patch corrects this and puts the item back into inventory.
| | * Mark GetUserInventory as obsolete. It is still used in the defaultMelanie2010-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-01-0359-777/+2134
|\ \ \ | |/ /
| * | Solve conflictMelanie2010-01-031-7/+0
| | |
| * | Merge branch 'master' into careminsterMelanie2010-01-0356-877/+1134
| |\ \ | | |/
| | * Cause llSetText to send prim updates.Melanie2010-01-031-0/+1
| | |
| | * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-0454-877/+1114
| | |
| | * Add virtual method StateChange to ScriptBaseClassMelanie2010-01-021-0/+4
| | |
| | * Prevent the creation of duplicate inventory folders in the case of a loginMelanie2010-01-012-2/+13
| | | | | | | | | | | | database issue. Now the login will instaead fail later.
| | * Put PassCollision on the ignore list for testing, since we don't save thatMelanie2009-12-311-0/+1
| | | | | | | | | | | | yet.
| * | Add virtual method StateChange to ScriptBaseClassMelanie2010-01-021-0/+4
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-313-64/+293
| |\ \ | | |/
| | * Readds llCollisionFilter and adds llPassCollision.Revolution2009-12-313-64/+293
| | | | | | | | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com>
| * | Merge branch 'master' into careminsterMelanie2009-12-3112-4/+878
| |\ \ | | |/
| | * Whitespace cleanup (changed hard tabs to 4 spaces)Melanie2009-12-312-486/+486
| | |
| | * Adds Friend Finding functionality.Revolution2009-12-311-0/+23
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * Adds tons of packets.Revolution2009-12-3111-3/+854
| | | | | | | | | | | | | | | | | | Applied with change: Changed spelling to Summary (from Summery) Signed-off-by: Melanie <melanie@t-data.com>
* | | Vehicle Linear parameter adjustmentsKitto Flora2009-12-313-38/+75
|/ /
* | Merge branch 'master' into careminsterMelanie2009-12-312-315/+67
|\ \ | |/
| * This patch caused serialization errors and needs to be reexaminedMelanie2009-12-312-315/+67
| | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0.
* | Merge branch 'master' into careminsterMelanie2009-12-315-67/+412
|\ \ | |/
| * [PATCH] Adds llCollisionFilterMelanie2009-12-312-67/+315
| | | | | | | | Thank you, Revolution. Applied with minor changes.
| * Adds osKickUser and osSetSpeedunknown2009-12-313-0/+97
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2009-12-311-0/+5
|\ \
| * | Revert "Merge branch 'master' into careminster"Melanie2009-12-302-22/+1
| | | | | | | | | | | | This reverts commit d49d44923d1be38f6fff12706b156562c6060566.
| * | Merge branch 'master' into careminsterMelanie2009-12-302-1/+22
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * * Fixes Sitting on the ground.Teravus Ovares (Dan Olivares)2009-12-302-3/+13
| | |
| * | Revert "Merge branch 'master' into careminster"Melanie2009-12-303-143/+4
| | | | | | | | | | | | This reverts commit 596af3f600462fb1e467714e5b898c10aa3d838b.
| * | Merge branch 'master' into careminsterMelanie2009-12-303-4/+143
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * * Makes forward and backward key reactions faster by responding to the NUDGE ↵Teravus Ovares (Dan Olivares)2009-12-302-9/+35
| | | | | | | | | | | | type movements.
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-2914-26/+49
| | |\
| | | * Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| | | |
| | * | * Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)2009-12-291-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| | | |
* | | | Add a small delay in NewAgentConnection to fix an issue with HippoMelanie2009-12-311-0/+3
|/ / / | | | | | | | | | (and possibly other cleints) getting their data mixed up.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2009-12-3013-26/+44
|\ \ \
| * \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2009-12-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | careminster
| * \ \ \ Merge branch 'master' into careminsterMelanie2009-12-2913-26/+44
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-2913-26/+44
| | | |/ | | |/| | | | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
| | * | One should not copy/paste so much :)Melanie2009-12-271-3/+3
| | | |
| | * | Fix the spelling :/Melanie2009-12-271-3/+3
| | | |