aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2013-01-082-2/+4
|\
| * also update m_lastSize in SendAvatarDataToAllAgents so more paths updateUbitUmarov2013-01-081-0/+2
| | | | | | | | it
| * Revert "Remove sending AvatarData because this also happens on login, where ↵Melanie2013-01-081-1/+9
| | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.
| * Merge branch 'ubitwork' into avinationMelanie2013-01-081-45/+61
| |\
| * | Remove sending AvatarData because this also happens on login, where it chokesMelanie2013-01-081-9/+1
| | | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline.
| * | Merge branch 'ubitwork' into avinationMelanie2013-01-071-3/+2
| |\ \
| * | | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-2/+2
| | | | | | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* | | | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-082-2/+6
| |_|/ |/| | | | | | | | crashes login on some viewers.
* | | put back position and rot change check before sending releasing plane constrainUbitUmarov2013-01-081-4/+7
| | |
* | | reduce sampling of camera raycasts to previus valueUbitUmarov2013-01-081-23/+26
| | |
* | | * DAnger, TEST * change camera plane collision detection. Still bounces onUbitUmarov2013-01-081-49/+59
| |/ |/| | | | | * prim edges due to camera lag
* | in raycast for camera exclude self detectionUbitUmarov2013-01-071-3/+2
|/
* check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+17
|
* make ResetMoveToTarget cancel any 'force' waiting to be applied to avatarUbitUmarov2013-01-031-7/+2
| | | | ( by the odd use of Velocity)
* cancel MoveToTarget (viewer 'go here") on sitsUbitUmarov2013-01-031-2/+22
|
* *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+4
|
* Merge branch 'ubitwork' into avinationMelanie2012-12-221-47/+46
|\
| * Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| |\
| * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-4/+6
| |\ \
| * | | some clean up/fixUbitUmarov2012-12-171-47/+46
| | | |
* | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-212-12/+21
| | | | | | | | | | | | | | | | Cached Bakes.
* | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| | | | | | | | | | | | | | | | synchronize with Agni.
* | | | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+19
| |_|/ |/| |
* | | Fix locking for goodMelanie2012-12-181-3/+3
| |/ |/|
* | Merge branch 'ubitwork' into avinationMelanie2012-12-171-174/+48
|\ \ | |/
| * * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| |
* | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-12-171-3/+3
|\ \ | | | | | | | | | | | | | | | | | | avination Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | * Fix for Prim Locking. Prior to the merge, it was just a clone of the ↵teravus2012-12-151-4/+4
| |/ | | | | | | root part to each of the child parts.
* | Fix locking objectsMelanie2012-12-161-1/+3
|/
* right fix this time ??UbitUmarov2012-12-131-1/+1
|
* fix the 'fix'UbitUmarov2012-12-131-2/+2
|
* fix coment out code not in useUbitUmarov2012-12-131-2/+2
|
* FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-4/+36
| | | | more messy)
* add some default size setting and checksUbitUmarov2012-12-071-1/+2
|
* revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-2/+2
| | | | since at least for now seems good enought
* create a new ode character also with the new informationUbitUmarov2012-12-071-0/+6
|
* *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+6
|
* avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-4/+11
| | | | avatar collider, just rounding the boxes, etc
* *TEST* diferent avatar colliderUbitUmarov2012-12-031-2/+13
|
* Merge branch 'master' into careminsterMelanie2012-11-233-19/+81
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-232-31/+25
| | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
| * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
| |
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
| | | | | | | | where core has a simple list
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
|\ \ | |/
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
| | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
* | Merge branch 'master' into careminsterMelanie2012-11-201-3/+20
|\ \ | |/
| * Minor formatting for 0962a35d and a few one-line comments as to why that ↵Justin Clark-Casey (justincc)2012-11-201-8/+7
| | | | | | | | code is there
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-173-5/+28
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-11-061-5/+10
| |\ \
generated by cgit v1.1 at 2024-11-10 07:05:15 +0000