aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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
| | | |
* | | | Fix a timer list locking issue causing XMREngine deadlocksMelanie2009-12-301-15/+17
| |_|/ |/| |
* | | Fix up the new Sirikata cient viewMelanie2009-12-271-1/+1
|/ /
* | One should not copy/paste so much :)Melanie2009-12-271-3/+3
| |
* | Fix the spelling :/Melanie2009-12-271-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2009-12-2718-0/+29757
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-2717-0/+29754
| |\
| | * * Implements some basic Sirikata protocol work (initial handshakes).Adam Frisby2009-12-272-1/+57
| | |
| | * * Implements Sirikata ClientStack ModuleAdam Frisby2009-12-2717-0/+29698
| | | | | | | | | | | | * Just a stub (imports all the sirikata protocol, and that's about it.)
| * | Encode the published and mature checkboxes into the user flags forMelanie2009-12-271-0/+3
| |/ | | | | | | profiles
| * Correct some issues with the last commitroot2009-12-261-1/+2
| |
* | Merge branch 'master' into casperCasperW2009-12-271-3/+5
|\ \
| * | Correct some issues with the last commitroot2009-12-271-1/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-261-2/+3
| |\ \ | | |/
| | * Close a SQL injection loophole in the new database driverMelanie2009-12-261-2/+3
| | |
* | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵CasperW2009-12-271-11/+13
|/ / | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash
* | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵CasperW2009-12-261-2/+2
| | | | | | | | hair will end up on your bum. Seen that before?
* | Merge branch 'master' into casperCasperW2009-12-2626-19/+737
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-268-1/+43
| |\ \ | | |/
| | * Add AvatarInterestsReplyMelanie2009-12-268-1/+43
| | |
| | * Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| | |
| * | Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-261-0/+25
| |\ \ | | |/
| | * Add a generic REPLACE INTO handler for put into the generic table handlerMelanie2009-12-261-0/+25
| | |
generated by cgit v1.1 at 2024-12-22 13:07:14 +0000