aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-11-0411-39/+72
|\
| * Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-042-0/+18
| * Prevent a null client from crashing windlight.Melanie2012-11-031-0/+3
| * Squash reporting HelloNeighbor exception - it simply means the other simMelanie2012-11-021-4/+4
| * Merge branch 'ubitwork' into avinationMelanie2012-11-021-20/+14
| |\
| | * lock unique and uniqueReleased in same order when both locks are neededUbitUmarov2012-11-021-20/+14
| | * Merge branch 'avination' into ubitworkUbitUmarov2012-10-3010-32/+75
| | |\
| * | \ Merge branch 'ubitwork' into avinationMelanie2012-11-015-14/+33
| |\ \ \ | | |/ /
| | * | revert last changeUbitUmarov2012-10-281-2/+1
| | * | fix ode timingUbitUmarov2012-10-281-1/+2
| | * | minor changeUbitUmarov2012-10-281-0/+1
| | * | test limit ode exec time by time not number of loops doneUbitUmarov2012-10-281-8/+13
| | * | more debugUbitUmarov2012-10-281-0/+2
| | * | remove pre physics build testingUbitUmarov2012-10-281-1/+1
| | * | Add some extra debug on scene closeUbitUmarov2012-10-281-1/+9
| | * | bug fixUbitUmarov2012-10-202-1/+3
| | * | UbitOde stop doing a copy of the asset data using just the reference toUbitUmarov2012-10-191-2/+3
| * | | Add AnimState to CADUMelanie2012-10-301-0/+18
| * | | Make sure we're not accessing a physics scene if we're not in one yet.Melanie2012-10-301-1/+1
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-11-038-50/+73
|\ \ \
| * | | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ...Diva Canto2012-11-023-8/+10
| * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| * | | Add [AssetService] AllowRemoteDeleteAllTypes (default false).Justin Clark-Casey (justincc)2012-11-022-15/+52
| * | | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ...Justin Clark-Casey (justincc)2012-11-023-34/+18
* | | | Merge branch 'master' into careminsterMelanie2012-11-014-5/+13
|\ \ \ \ | |/ / /
| * | | Comment out checks not to overwrite existing IAR/OAR files for now on "save i...Justin Clark-Casey (justincc)2012-11-012-4/+6
| * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ...Dan Lake2012-10-312-1/+7
* | | | Merge branch 'master' into careminsterMelanie2012-10-319-34/+83
|\ \ \ \ | |/ / /
| * | | Also add the additional ScriptException constructor necessary to get [Seriali...Justin Clark-Casey (justincc)2012-10-311-0/+3
| * | | Mark ScriptException as [Serializable] for when it has to cross AppDomainsJustin Clark-Casey (justincc)2012-10-311-0/+1
| * | | Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously rathe...Justin Clark-Casey (justincc)2012-10-311-2/+2
| * | | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-317-35/+77
* | | | Merge branch 'master' into careminsterMelanie2012-10-316-8/+54
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-303-7/+21
| |\ \ \
| | * | | Only create a new list to check if objects have reached targets if there actu...Justin Clark-Casey (justincc)2012-10-301-5/+9
| | * | | Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceiv...Justin Clark-Casey (justincc)2012-10-301-0/+6
| | * | | Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining...Justin Clark-Casey (justincc)2012-10-301-1/+5
| | * | | Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exce...Justin Clark-Casey (justincc)2012-10-301-1/+1
| * | | | Store and send the current movement animation state to a new sim on crossingMelanie2012-10-302-0/+17
| * | | | Add AnimState to CADUMelanie2012-10-301-0/+36
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
* | | | Put back the collision sound shim into SOPMelanie2012-10-301-0/+29
* | | | Merge branch 'master' into careminsterMelanie2012-10-3012-307/+478
|\ \ \ \ | | |/ / | |/| |
| * | | Make MeshAssetReceived private.Justin Clark-Casey (justincc)2012-10-301-1/+1
| * | | correct ODEPrim.MeshAssetReveived -> MeshAssetReceivedJustin Clark-Casey (justincc)2012-10-301-3/+2
| * | | refactoring to use assembly:classname style of configurationSignpostMarv2012-10-291-1/+4
| * | | Renaming module back to SoundModule as the hypothetical plan was to make anot...SignpostMarv2012-10-291-3/+3
| * | | SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.St...SignpostMarv2012-10-291-6/+3
| * | | tweaking configuration logic so that the INonSharedRegionModule will load by ...SignpostMarv2012-10-291-4/+9