Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 32 | -166/+393 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | Many explanitory comments added to the link and delink code in | Robert Adams | 2012-07-11 | 2 | -23/+93 |
| | | | | | | | | SOG and SOP. Should have no functionality changes. | ||||
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-11 | 20 | -80/+51 |
| | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM. | ||||
| * | Fix build break for windows with missing package for IScriptEngine in ↵ | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -0/+1 |
| | | | | | | | | prebuild.xml for OpenSim.Region.CoreModules.Tests.dll | ||||
| * | Allow XEngine StartDelay to be configured in the [XEngine] config section. | Justin Clark-Casey (justincc) | 2012-07-11 | 3 | -3/+12 |
| | | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally. | ||||
| * | Remove WorldComm module from the regression TestCompileAndStartScript() ↵ | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -4/+1 |
| | | | | | | | | since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths | ||||
| * | Add regression TestDetachScriptedAttachmentToInventory() | Justin Clark-Casey (justincc) | 2012-07-11 | 9 | -32/+151 |
| | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml | ||||
| * | Add regression TestRezScriptedAttachmentsFromInventory() though this ↵ | Justin Clark-Casey (justincc) | 2012-07-11 | 3 | -23/+85 |
| | | | | | | | | currently only checks for the presence of script items, not for started scripts | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 21 | -400/+746 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| * | | remove expensive and leaked ( in Xengine at least) SayShout timer and | UbitUmarov | 2012-07-11 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | replace it by a simpler function that should do the same (?) (don't like much those 10 + 1 bursts) | ||||
| * | | ubitODE leaks | UbitUmarov | 2012-07-11 | 3 | -25/+33 |
| | | | |||||
| * | | stop keeping references to objects on released items | UbitUmarov | 2012-07-11 | 1 | -1/+10 |
| | | | |||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-11 | 1 | -5/+8 |
| |\ \ | |||||
| | * \ | Merge branch 'ubitwork' into avination | Melanie | 2012-07-11 | 4 | -14/+40 |
| | |\ \ | |||||
| | | * | | Make sure handles stay intact when removing from the MinHeap | Melanie | 2012-07-11 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-11 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-10 | 7 | -44/+144 |
| | |\ \ | |||||
| * | | | | Melanie fix: detach SOGs from backup on linking | UbitUmarov | 2012-07-11 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | clear released minheap items so they don't keep holding references to | UbitUmarov | 2012-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | objects. | ||||
| * | | | | add some more memory information to StatsCollector | UbitUmarov | 2012-07-10 | 1 | -4/+20 |
| | | | | | |||||
| * | | | | console region restart: Let Xengine not cry all over the place with | UbitUmarov | 2012-07-10 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | errors also. May not be that good, but is not in use in AVN (i hope). Still safer to do a full shutdown and refire the region from a OS tool like a script, monit, etc etc | ||||
| * | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-10 | 1 | -5/+7 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | Reinstate parallel fetching of residents and remove a left over return from ↵ | Melanie | 2012-07-08 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | debugging | ||||
| * | | | lltargetomega efective spinrate now multiplied by gain ( need check ) | UbitUmarov | 2012-07-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | let SOP AngularVelocity set physics actor angular velocity if it's | UbitUmarov | 2012-07-10 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | physical root prim and not a vehicle. With this llSetAngularVelocity should work and also llTargetOmega will do the same in this case. but for now this llTargetOmega is being a normal physical rotation with damping, and stops with selection. Thats not like SL apparently | ||||
| * | | | more work on llSetAngularVelocity() | UbitUmarov | 2012-07-10 | 2 | -4/+29 |
| | | | | |||||
| * | | | let rotationVelocity or AngularVelocity be setted on prims. Limited to | UbitUmarov | 2012-07-10 | 1 | -19/+46 |
| | | | | | | | | | | | | | | | | 12rad/s | ||||
| * | | | changed ODE lib for win32 to version 0.12 | UbitUmarov | 2012-07-10 | 1 | -0/+0 |
| | | | | |||||
| * | | | change linux 32bit libode.so to ode version 0.12 | ubit | 2012-07-10 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-09 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | retry fixing ode getconfiguration() | UbitUmarov | 2012-07-09 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-09 | 2 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | fix ode getconfiguration | UbitUmarov | 2012-07-09 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-09 | 1 | -3/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | log ODE lib configuration | UbitUmarov | 2012-07-09 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-09 | 1 | -15/+43 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | fix ODE dispose plus minor clean. On regions restart ode.dispose seems | UbitUmarov | 2012-07-09 | 1 | -15/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | to be called with scene still calling simulation, that should be changed, for now added a check for a valid world in ode simulation | ||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-08 | 6 | -289/+416 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-08 | 6 | -289/+416 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Revamp map block sending to eliminate overload of the grid server connection | Melanie | 2012-07-08 | 2 | -98/+204 |
| | | | | | | | | | | | | | | | | | | | | and the sim's http client | ||||
| | | * | | Instead of sending 20 records in 2 packets, send just one as we intended in ↵ | Melanie | 2012-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | the first place. | ||||
| | | * | | Address map lag issue seen with non-avination viewers | Melanie | 2012-07-08 | 3 | -262/+271 |
| | | | | | |||||
| | | * | | Change semantics of FromXML on vehicle data to make the serializer a bit cleaner | Melanie | 2012-07-07 | 2 | -7/+19 |
| | | | | | |||||
| | | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-07 | 1 | -7/+13 |
| | | |\ \ | |||||
| | * | \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-07 | 0 | -0/+0 |
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | |||||
| | | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-07 | 3 | -5/+9 |
| | | |\ \ | |||||
| * | | \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-07 | 1 | -7/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | fix vehicle to XML string | UbitUmarov | 2012-07-07 | 1 | -7/+13 |
| | | | | | | |||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-07 | 4 | -27/+73 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-07 | 4 | -27/+73 |
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | |