Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2010-01-04 | 2 | -0/+9 | |
| |\ \ | | |/ | ||||||
| | * | When rezzing a no-copy object on a no-rez parcel, the object vanishes from | Melanie | 2010-01-04 | 1 | -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 default | Melanie | 2010-01-04 | 1 | -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/careminster | Kitto Flora | 2010-01-03 | 59 | -777/+2134 | |
|\ \ \ | |/ / | ||||||
| * | | Solve conflict | Melanie | 2010-01-03 | 1 | -7/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 56 | -877/+1134 | |
| |\ \ | | |/ | ||||||
| | * | Cause llSetText to send prim updates. | Melanie | 2010-01-03 | 1 | -0/+1 | |
| | | | ||||||
| | * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 54 | -877/+1114 | |
| | | | ||||||
| | * | Add virtual method StateChange to ScriptBaseClass | Melanie | 2010-01-02 | 1 | -0/+4 | |
| | | | ||||||
| | * | Prevent the creation of duplicate inventory folders in the case of a login | Melanie | 2010-01-01 | 2 | -2/+13 | |
| | | | | | | | | | | | | database issue. Now the login will instaead fail later. | |||||
| | * | Put PassCollision on the ignore list for testing, since we don't save that | Melanie | 2009-12-31 | 1 | -0/+1 | |
| | | | | | | | | | | | | yet. | |||||
| * | | Add virtual method StateChange to ScriptBaseClass | Melanie | 2010-01-02 | 1 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 3 | -64/+293 | |
| |\ \ | | |/ | ||||||
| | * | Readds llCollisionFilter and adds llPassCollision. | Revolution | 2009-12-31 | 3 | -64/+293 | |
| | | | | | | | | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 12 | -4/+878 | |
| |\ \ | | |/ | ||||||
| | * | Whitespace cleanup (changed hard tabs to 4 spaces) | Melanie | 2009-12-31 | 2 | -486/+486 | |
| | | | ||||||
| | * | Adds Friend Finding functionality. | Revolution | 2009-12-31 | 1 | -0/+23 | |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | Adds tons of packets. | Revolution | 2009-12-31 | 11 | -3/+854 | |
| | | | | | | | | | | | | | | | | | | Applied with change: Changed spelling to Summary (from Summery) Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | | | Vehicle Linear parameter adjustments | Kitto Flora | 2009-12-31 | 3 | -38/+75 | |
|/ / | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 2 | -315/+67 | |
|\ \ | |/ | ||||||
| * | This patch caused serialization errors and needs to be reexamined | Melanie | 2009-12-31 | 2 | -315/+67 | |
| | | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 5 | -67/+412 | |
|\ \ | |/ | ||||||
| * | [PATCH] Adds llCollisionFilter | Melanie | 2009-12-31 | 2 | -67/+315 | |
| | | | | | | | | Thank you, Revolution. Applied with minor changes. | |||||
| * | Adds osKickUser and osSetSpeed | unknown | 2009-12-31 | 3 | -0/+97 | |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2009-12-31 | 1 | -0/+5 | |
|\ \ | ||||||
| * | | Revert "Merge branch 'master' into careminster" | Melanie | 2009-12-30 | 2 | -22/+1 | |
| | | | | | | | | | | | | This reverts commit d49d44923d1be38f6fff12706b156562c6060566. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-30 | 2 | -1/+22 | |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | * Fixes Sitting on the ground. | Teravus Ovares (Dan Olivares) | 2009-12-30 | 2 | -3/+13 | |
| | | | ||||||
| * | | Revert "Merge branch 'master' into careminster" | Melanie | 2009-12-30 | 3 | -143/+4 | |
| | | | | | | | | | | | | This reverts commit 596af3f600462fb1e467714e5b898c10aa3d838b. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-30 | 3 | -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-30 | 2 | -9/+35 | |
| | | | | | | | | | | | | type movements. | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-12-29 | 14 | -26/+49 | |
| | |\ | ||||||
| | | * | Fix an omission in LSL that causes a viewer crash | Melanie | 2009-12-30 | 1 | -0/+5 | |
| | | | | ||||||
| | * | | * Attempts to resolve the megaregion terrain edit rebound. | Teravus Ovares (Dan Olivares) | 2009-12-29 | 1 | -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 crash | Melanie | 2009-12-30 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Add a small delay in NewAgentConnection to fix an issue with Hippo | Melanie | 2009-12-31 | 1 | -0/+3 | |
|/ / / | | | | | | | | | | (and possibly other cleints) getting their data mixed up. | |||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2009-12-30 | 13 | -26/+44 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-29 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | careminster | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 13 | -26/+44 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 13 | -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 :) | Melanie | 2009-12-27 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | Fix the spelling :/ | Melanie | 2009-12-27 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Fix a timer list locking issue causing XMREngine deadlocks | Melanie | 2009-12-30 | 1 | -15/+17 | |
| |_|/ |/| | | ||||||
* | | | Fix up the new Sirikata cient view | Melanie | 2009-12-27 | 1 | -1/+1 | |
|/ / | ||||||
* | | One should not copy/paste so much :) | Melanie | 2009-12-27 | 1 | -3/+3 | |
| | | ||||||
* | | Fix the spelling :/ | Melanie | 2009-12-27 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-27 | 21 | -0/+29821 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-27 | 18 | -0/+29787 | |
| |\ | ||||||
| | * | * Implements some basic Sirikata protocol work (initial handshakes). | Adam Frisby | 2009-12-27 | 2 | -1/+57 | |
| | | | ||||||
| | * | * Added prebuild for previous commit. | Adam Frisby | 2009-12-27 | 1 | -0/+33 | |
| | | |