aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-295-11/+23
|\
| * Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-295-11/+23
| | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
* | 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-262-1/+66
|\ \
| * | Recover out-of-region objects during db load.Kitto Flora2009-12-241-0/+24
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-241-1/+2
| |\ \ | | |/
| | * Fixes the broken build of the previous commit.Diva Canto2009-12-231-1/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-231-1/+41
| |\ \ | | |/
| | * Add saving assets from gestures to IARMelanie2009-12-231-1/+41
| | |
| | * Add a data path for error messagesroot2009-12-224-6/+39
| | | | | | | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
* | | Fix for landing points. Only one scenario is not fully covered by this ↵CasperW2009-12-263-15/+59
|/ / | | | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
* | Add a data path for error messagesroot2009-12-224-6/+39
| |
* | Should not commit without compilingroot2009-12-221-1/+1
| |
* | Jumped the gun...root2009-12-221-1/+1
| |
* | Allow 100ms for scripts to run attach(NULL_KEY) on detachroot2009-12-221-0/+12
| |
* | Merge branch 'master' into careminsterMelanie2009-12-222-2/+3
|\ \ | |/
| * Glue code for a couple of new LSL function implementationsMelanie2009-12-222-0/+51
| |
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+1
|\ \ | |/
| * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
| | | | | | | | doesn't pick up the old state again.
* | Merge branch 'master' into casperCasperW2009-12-215-34/+62
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-212-8/+49
| |\ \ | | |/
| | * Script State Fix: Part 2Melanie2009-12-212-8/+49
| | | | | | | | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core.
| * | Merge branch 'master' into careminsterMelanie2009-12-202-4/+4
| |\ \ | | |/
| | * Fix a case where an idle sim can eat 100% of a coreMelanie2009-12-201-1/+1
| | |
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-12-151-3/+3
| | |
| * | Merge branch 'tests'Kitto Flora2009-12-191-22/+9
| |\ \
| | * | Fix mantis #10 & #14Kitto Flora2009-12-191-23/+10
| | | |
* | | | Fixed a nasty crash in StandUp() that occurred when the part got killed with ↵CasperW2009-12-211-13/+41
|/ / / | | | | | | | | | an avatar sitting on it.
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-172-2/+14
| | |
* | | Fix GetWorldRotation(), and a host of related Sit fixes.Kitto Flora2009-12-172-37/+38
|/ /
* | Fix prim linking bug, Manis #14Kitto Flora2009-12-151-2/+8
| |
* | Merge branch 'master' into testsKitto Flora2009-12-151-1/+17
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-141-1/+17
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-141-0/+5
| | |\
| | | * * Implements OSSL function: osGetSimulatorMemory - returns the current ↵Adam Frisby2009-12-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-141-1/+12
| | |/
* | | Removed excessive call to UpdateMovementAnimations which prevented ↵Kitto Flora2009-12-151-25/+23
| | | | | | | | | | | | GroundSit; Corrected cause of 'sit on roof'.
* | | Commit partial work because of repo changeKitto Flora2009-12-121-11/+72
|/ /
* | Merge branch 'master' into careminsterMelanie2009-12-122-17/+231
|\ \ | |/
| * * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."Teravus Ovares (Dan Olivares)2009-12-122-5/+15
| | | | | | | | * Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-121-33/+4
| |\
| * | * Commit some sit code that's commented out for now.Teravus Ovares (Dan Olivares)2009-12-081-13/+215
| | |
* | | Merge branch 'master' into careminsterMelanie2009-12-121-33/+4
|\ \ \ | | |/ | |/|
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-121-33/+4
| |/ | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-102-120/+162
|\ \ | | | | | | | | | careminster
| * | Correct AbsolutePosition calculationKittoFlora2009-12-081-1/+2
| | |
| * | Fix linked physical daughter prim position update.KittoFlora2009-12-062-5/+14
| | |
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-052-113/+148
| | | | | | | | | | | | spammy debug messages in Interregion....
* | | Last bits and bobs to clean up the Meta7WindlightModuleCasperW2009-12-091-1/+7
| | |