aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-311-27/+25
|\
| * Fix line endingsDan Lake2011-10-301-23/+23
| * Experimental reorder of Heartbeat loop now simulates physics and sends update...Dan Lake2011-10-301-29/+27
* | Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
* | Merge branch 'master' into bigmergeMelanie2011-10-3010-139/+125
|\ \ | |/
| * Remove the SyncRoot locking from Scene which was only being done around the m...Justin Clark-Casey (justincc)2011-10-293-32/+18
| * Add taint target velocity for ODECharacters as is already done for ODECharact...Justin Clark-Casey (justincc)2011-10-291-7/+12
| * tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment dir...Justin Clark-Casey (justincc)2011-10-291-51/+39
| * Move position set from taint to logically better position at top of ODECharac...Justin Clark-Casey (justincc)2011-10-291-12/+12
| * Stop setting _position as well as m_taint_position in ODECharacter.PositionJustin Clark-Casey (justincc)2011-10-292-6/+3
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-293-18/+10
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ...Justin Clark-Casey (justincc)2011-10-282-7/+2
| * Add missing doc to rotation/position methods in SOGJustin Clark-Casey (justincc)2011-10-281-5/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-2822-227/+171
| |\
| * | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fet...Justin Clark-Casey (justincc)2011-10-282-6/+21
* | | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
* | | Reduce severity and remove duplication if a common log message regardingMelanie2011-10-281-3/+1
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2727-218/+209
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-10-2727-218/+209
| |\ \ \ | | | |/ | | |/|
| | * | Removed use of 'is' operator and casting to find the root ScenePresence in Me...Dan Lake2011-10-274-82/+53
| | * | Continuation of previous checkin. Found more places where ForEachScenePresenc...Dan Lake2011-10-274-57/+39
| | * | Added new ForEachRootScenePresence to Scene since almost every delegate passe...Dan Lake2011-10-2714-88/+79
| | |/
| | * For now, comment out error message on new script engine console commands.Justin Clark-Casey (justincc)2011-10-271-1/+4
| | * Comment out inventory folder bulk update code on InventoryAccepted message in...Justin Clark-Casey (justincc)2011-10-271-12/+18
| | * Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly pa...Justin Clark-Casey (justincc)2011-10-271-1/+3
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-273-14/+93
| | |\
| | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would only...Justin Clark-Casey (justincc)2011-10-273-1/+26
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2659-164/+495
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into bigmergeMelanie2011-10-267-21/+89
| |\ \ \ | | | |/ | | |/|
| | * | Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-261-6/+61
| | * | Implementation of PRIM_OMEGA, but only for settingSignpostMarv Martin2011-10-262-4/+18
| | * | Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
| | |/
| * | Merge branch 'master' into bigmergeMelanie2011-10-2653-149/+412
| |\ \ | | |/
| | * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-252-9/+11
| | * In Watchdog, add ability to specific timeout for a thread.Justin Clark-Casey (justincc)2011-10-251-16/+56
| | * Add m_threads dictionary locking to Watchdog.GetThreads()Justin Clark-Casey (justincc)2011-10-251-1/+2
| | * Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from...Justin Clark-Casey (justincc)2011-10-251-0/+2
| | * Remove unused fields from CollisionEventUpdateJustin Clark-Casey (justincc)2011-10-255-28/+10
| | * Get rid of the pointless null checks on collision listeners. Add warning abo...Justin Clark-Casey (justincc)2011-10-253-7/+6
| | * When sending object collision updates, don't null out and recreate the Collis...Justin Clark-Casey (justincc)2011-10-252-13/+8
| | * For ScenePresence collision events, instead of creating a new CollisionEvents...Justin Clark-Casey (justincc)2011-10-253-9/+17
| | * Fix bug where collision event listeners were not removed once the listener ha...Justin Clark-Casey (justincc)2011-10-251-4/+5
| | * minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it'...Justin Clark-Casey (justincc)2011-10-251-4/+4
| | * minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
| | * Add "threads abort <thread-id>" simulator console command that allows us to a...Justin Clark-Casey (justincc)2011-10-252-2/+48
| | * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-2543-69/+243
* | | Fix a missing locking callMelanie2011-10-251-0/+1
|/ /
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-254-9/+31
|\ \ | |/