Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | 18 | -0/+29757 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-27 | 17 | -0/+29754 | |
| |\ | ||||||
| | * | * Implements some basic Sirikata protocol work (initial handshakes). | Adam Frisby | 2009-12-27 | 2 | -1/+57 | |
| | | | ||||||
| | * | * Implements Sirikata ClientStack Module | Adam Frisby | 2009-12-27 | 17 | -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 for | Melanie | 2009-12-27 | 1 | -0/+3 | |
| |/ | | | | | | | profiles | |||||
| * | Correct some issues with the last commit | root | 2009-12-26 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-27 | 1 | -3/+5 | |
|\ \ | ||||||
| * | | Correct some issues with the last commit | root | 2009-12-27 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -2/+3 | |
| |\ \ | | |/ | ||||||
| | * | Close a SQL injection loophole in the new database driver | Melanie | 2009-12-26 | 1 | -2/+3 | |
| | | | ||||||
* | | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵ | CasperW | 2009-12-27 | 1 | -11/+13 | |
|/ / | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash | |||||
* | | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵ | CasperW | 2009-12-26 | 1 | -2/+2 | |
| | | | | | | | | hair will end up on your bum. Seen that before? | |||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-26 | 26 | -19/+737 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 8 | -1/+43 | |
| |\ \ | | |/ | ||||||
| | * | Add AvatarInterestsReply | Melanie | 2009-12-26 | 8 | -1/+43 | |
| | | | ||||||
| | * | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 | |
| | | | ||||||
| * | | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -0/+25 | |
| |\ \ | | |/ | ||||||
| | * | Add a generic REPLACE INTO handler for put into the generic table handler | Melanie | 2009-12-26 | 1 | -0/+25 | |
| | | | ||||||
| * | | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS | Melanie | 2009-12-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always. | |||||
| * | | Restore version suffix. | Melanie | 2009-12-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-25 | 3 | -2/+28 | |
| |\ \ | | | | | | | | | | | | | careminster | |||||
| | * | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 3 | -2/+28 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-25 | 2 | -0/+17 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-25 | 1 | -0/+4 | |
| | |\ | ||||||
| | | * | Clear Shape.SculptEntry if prim type is not a sculptie in ↵ | dahlia | 2009-12-24 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | llSetPrimitiveParams() - addresses Mantis #4462 | |||||
| | * | | Enable the profile module to be replaced completely, even for the base | Melanie | 2009-12-25 | 1 | -0/+13 | |
| | |/ | | | | | | | | | | profile data | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 3 | -0/+483 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-24 | 3 | -0/+483 | |
| | |\ |