aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-016-24/+52
|\
| * Merge branch 'master' into bigmergeMelanie2011-12-016-24/+52
| |\
| | * Provide more user feedback when "debug http" is setJustin Clark-Casey (justincc)2011-11-291-1/+4
| | * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-292-2/+3
| | * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-293-6/+6
| | * minor: remove mono compile warning, a Vector3 can never be null since it's a ...Justin Clark-Casey (justincc)2011-11-291-9/+6
| | * tabulate "show caps" output for easier readabilityJustin Clark-Casey (justincc)2011-11-291-5/+10
| | * Correct mistake in "debug eq" helpJustin Clark-Casey (justincc)2011-11-291-1/+1
| | * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-2/+24
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-2815-263/+313
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-2815-263/+313
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-11-269-98/+66
| | |\
| | | * When removing an LSL sensor for a script (e.g. through llResetScript() or sta...Justin Clark-Casey (justincc)2011-11-261-1/+1
| | | * minor: formatting changes in Scene.PacketHandlers.csJustin Clark-Casey (justincc)2011-11-261-5/+5
| | | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-261-1/+1
| | | * Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().Justin Clark-Casey (justincc)2011-11-262-59/+0
| | | * Use the same web fetch handler for every request from every avatar, since it ...Justin Clark-Casey (justincc)2011-11-261-3/+11
| | | * Fix config so that you can have both WebFetchInventoryDescendents and FetchIn...Justin Clark-Casey (justincc)2011-11-251-1/+2
| | | * Resolve error where an unknown asset type would cause the fetch inventory des...Justin Clark-Casey (justincc)2011-11-251-4/+1
| | | * Implement the FetchInventoryDescendents2 capability using the same code as We...Justin Clark-Casey (justincc)2011-11-251-17/+38
| | | * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-253-8/+8
| | | * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conv...Justin Clark-Casey (justincc)2011-11-251-2/+2
| | * | Add missing property to llGetLinkPrimitiveParamsBlueWall2011-11-262-0/+4
| | |/
| | * Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/Inventory...Justin Clark-Casey (justincc)2011-11-251-0/+2
| | * Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPos...Justin Clark-Casey (justincc)2011-11-241-4/+2
| | * When setting packet level logging via "debug packet", apply to all clients, n...Justin Clark-Casey (justincc)2011-11-242-21/+21
| | * comment out a noisy log line I accidentally left in from the last commitJustin Clark-Casey (justincc)2011-11-241-1/+1
| | * Stop passing a request handler to the initial caps.RegisterHandler in EventQu...Justin Clark-Casey (justincc)2011-11-241-157/+162
| | * Add a "debug eq" console command for debugging.Justin Clark-Casey (justincc)2011-11-241-6/+79
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-241-101/+101
| | |\
| | * | Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots...Justin Clark-Casey (justincc)2011-11-241-1/+1
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-2414-627/+610
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into bigmergeMelanie2011-11-2414-627/+610
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-232-2/+27
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-11-2310-290/+269
| | | |\
| | | * | Shell Environment Variables in configBlueWall2011-11-232-2/+27
| | * | | Line endingsDan Lake2011-11-231-101/+101
| | | |/ | | |/|
| | * | Log error if we attempt to add/remove an OdeCharacter from the _characters li...Justin Clark-Casey (justincc)2011-11-221-23/+33
| | * | Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since th...Justin Clark-Casey (justincc)2011-11-221-6/+1
| | * | Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-222-66/+60
| | * | Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()Justin Clark-Casey (justincc)2011-11-221-27/+27
| | * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-221-1/+1
| | * | Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-224-29/+22
| | * | slightly simplify OdeScene.Simulate() by removing bool processtaints, since w...Justin Clark-Casey (justincc)2011-11-223-141/+128
| | |/
| | * Slightly improve "Unable to space collide" logging message, though I don't th...Justin Clark-Casey (justincc)2011-11-211-1/+2
| | * Get rid of OdeCharacter != null checks since OdeScene._characters can never c...Justin Clark-Casey (justincc)2011-11-211-17/+4
| | * remove unnecessary OdeScene._activeprims locking. Code is single-threadedJustin Clark-Casey (justincc)2011-11-211-53/+46
| | * Restore defects list. In hindsight, the reason for this is becuase we can't ...Justin Clark-Casey (justincc)2011-11-212-92/+112
| | * simplify operation of OdeScene._perloopContactJustin Clark-Casey (justincc)2011-11-211-45/+51
| | * don't bother locking OdeScene._perloopContact in single threaded codeJustin Clark-Casey (justincc)2011-11-211-47/+42