Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-15 | 1 | -1/+1 |
|\ | |||||
| * | Allow llTeleportAgent to teleport gods when not in god mode | Melanie | 2012-03-14 | 1 | -1/+1 |
| | | |||||
* | | added ObjectPhysicsProperties http event message to send viewer that data. ↵ | UbitUmarov | 2012-03-15 | 10 | -1/+76 |
| | | | | | | | | For now on caps/EventQueue, and still only used on a material change... | ||||
* | | bug fixs, added a default physics shape estimator based on being a mesh or ↵ | UbitUmarov | 2012-03-14 | 4 | -18/+82 |
|/ | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 15 | -75/+148 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-13 | 3 | -25/+50 |
| |\ | |||||
| | * | refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵ | Justin Clark-Casey (justincc) | 2012-03-14 | 3 | -25/+50 |
| | | | | | | | | | | | | | | | | | | it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event) Also add other various illustrative comments | ||||
| * | | Teleports: bounce off repeated requests of teleporting the same agent. Some ↵ | Diva Canto | 2012-03-13 | 1 | -0/+13 |
| | | | | | | | | | | | | scripts do that, and that fails the whole thing. | ||||
| * | | Minor sanity check on simulation agent handler (content type) | Diva Canto | 2012-03-13 | 1 | -7/+12 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-13 | 7 | -9/+15 |
| |\ \ | | |/ | |||||
| | * | Add max thread and min thread information to "xengine status" region console ↵ | Justin Clark-Casey (justincc) | 2012-03-12 | 2 | -0/+5 |
| | | | | | | | | | | | | command | ||||
| | * | Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream(). | Robert Adams | 2012-03-12 | 4 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0. | ||||
| | * | Change OpenSim.ini.example to reflect how to actually enable prim limits, | Melanie | 2012-03-12 | 1 | -5/+1 |
| | | | | | | | | | | | | as opposed to how it was first designed. | ||||
| * | | Datasnapshot: added "secret" to the registration/deregistration query so ↵ | Diva Canto | 2012-03-13 | 2 | -33/+28 |
| |/ | | | | | | | that data providers can verify authenticity if they want. | ||||
| * | DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the ↵ | Diva Canto | 2012-03-12 | 1 | -2/+2 |
| | | | | | | | | capitalization of 'name' to lower case, also in the same <grid> section. | ||||
| * | Added osGetGridGatekeeperURI() | Diva Canto | 2012-03-10 | 3 | -0/+20 |
| | | |||||
* | | Implement llSetPrimitiveParams for physics shape and material. Add | Melanie | 2012-03-13 | 4 | -0/+77 |
| | | | | | | | | llSetPhysicsMaterial support. | ||||
* | | Hook up the new cap to the SOP changes | Melanie | 2012-03-13 | 1 | -8/+5 |
| | | |||||
* | | Merge branch 'ubitwork' | Melanie | 2012-03-13 | 8 | -34/+361 |
|\ \ | |||||
| * | | missed commit of extraphysics parameters serialization.. | UbitUmarov | 2012-03-13 | 1 | -6/+46 |
| | | | |||||
| * | | let PhysicsShapeType none remove physics remove physics on child parts ↵ | UbitUmarov | 2012-03-13 | 1 | -10/+38 |
| | | | | | | | | | | | | **UnTested** | ||||
| * | | bug fix | UbitUmarov | 2012-03-13 | 1 | -2/+2 |
| | | | |||||
| * | | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵ | UbitUmarov | 2012-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | with it disabled... | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-13 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵ | UbitUmarov | 2012-03-13 | 7 | -22/+281 |
| | | | | | | | | | | | | | | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc | ||||
* | | | | Implement the cap to send extra physics params to the viewer. Not functional | Melanie | 2012-03-13 | 1 | -0/+38 |
| |/ / |/| | | | | | | | | yet because the parameters are not actually stored anywhere yet. | ||||
* | | | Ensure child prims of a phantom prim are marked as phantom | Melanie | 2012-03-13 | 1 | -2/+2 |
|/ / | |||||
* | | Refactor, move OjectChangeData into it's own file and rename | Melanie | 2012-03-13 | 6 | -165/+133 |
| | | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type! | ||||
* | | Restore duplication of the SL bug where linking phantom to solid lets the | Melanie | 2012-03-12 | 1 | -3/+2 |
| | | | | | | | | child prim remain phantom | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-03-12 | 4 | -16/+68 |
|\ \ | |||||
| * | | allocate UndoRedoStore only on demand | UbitUmarov | 2012-03-12 | 1 | -10/+17 |
| | | | |||||
| * | | ubitode prim select was not doing phantom case | UbitUmarov | 2012-03-12 | 1 | -6/+17 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-12 | 1 | -0/+33 |
| |\ \ | |||||
| | * | | Allow RLV to redirect received folders to #RLV folder | Melanie | 2012-03-11 | 1 | -0/+33 |
| | | | | |||||
| * | | | missing file in ubitODE | UbitUmarov | 2012-03-12 | 1 | -0/+1 |
| | | | | |||||
* | | | | Add AVATAR_MALE flag to return values of llGetAgentInfo | Melanie | 2012-03-12 | 2 | -0/+6 |
|/ / / | |||||
* | | | ubitOde also knows a bit more about physical phantom | UbitUmarov | 2012-03-11 | 1 | -29/+142 |
| | | | |||||
* | | | Physical phantoms testable with chOde. Volume detection was changed and ↵ | UbitUmarov | 2012-03-11 | 1 | -138/+145 |
| | | | | | | | | | | | | also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED *** | ||||
* | | | bug fix (??) in sog copy() | UbitUmarov | 2012-03-11 | 1 | -10/+19 |
| | | | |||||
* | | | more phantom physics ( chODE and a fix in manager physicsactor | UbitUmarov | 2012-03-11 | 2 | -62/+121 |
| | | | |||||
* | | | initial steps to support physical phantoms | UbitUmarov | 2012-03-11 | 6 | -13/+73 |
| | | | |||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-11 | 12 | -150/+296 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-03-11 | 12 | -150/+296 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-03-11 | 12 | -150/+296 |
| | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-10 | 11 | -114/+257 |
| | | |\ | |||||
| | | | * | Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate ↵ | Justin Clark-Casey (justincc) | 2012-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread. This was previous behaviour anyway. | ||||
| | | | * | minor: In IAR save, log when we start adding the control file rather than ↵ | Justin Clark-Casey (justincc) | 2012-03-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | saying afterwards that we added it. | ||||
| | | | * | minor: rearrange some save oar messages so they say what they're about to do ↵ | Justin Clark-Casey (justincc) | 2012-03-10 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | rather than what they've just done. | ||||
| | | | * | On OAR saving, try fetch assets serially rather than firing all the requests ↵ | Justin Clark-Casey (justincc) | 2012-03-10 | 2 | -9/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the asset service at once. This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898 Quick tests show that save time is the same. | ||||
| | | | * | Add satguru and Fernando to contributors | Justin Clark-Casey (justincc) | 2012-03-10 | 1 | -0/+2 |
| | | | | |