aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-136-20/+150
|\
| * add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-136-20/+150
| | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-113-88/+108
|\ \ | |/
| * make ubitODE ignore X and Y rotation components on avatar rotationsUbitUmarov2012-12-111-14/+37
| |
| * changes on the fast speed avatars collider, collisions from above, etcUbitUmarov2012-12-111-62/+64
| |
| * fix let other phys plugins work.. broken when added feetOffsetUbitUmarov2012-12-113-13/+8
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-114-4/+12
|\ \ | |/
| * missing files remove some warnings...UbitUmarov2012-12-113-4/+3
| |
| * missing fileUbitUmarov2012-12-111-0/+9
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-113-301/+392
|\ \ | |/
| * a few more changes on avatar colliderUbitUmarov2012-12-112-299/+363
| |
| * typo fixUbitUmarov2012-12-101-2/+3
| |
| * add velocityinterpolator packets handling but actually do nothing, sinceUbitUmarov2012-12-091-1/+27
| | | | | | | | they don't do what i was looking for.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-1/+2
|\ \ | |/
| * add some default size setting and checksUbitUmarov2012-12-071-1/+2
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-074-12/+28
|\ \ | |/
| * revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-074-12/+28
| | | | | | | | since at least for now seems good enought
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-074-5/+26
|\ \ | |/
| * create a new ode character also with the new informationUbitUmarov2012-12-074-5/+26
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-075-5/+66
|\ \ | |/
| * *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-075-5/+66
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-2/+2
|\ \ | |/
| * fix regressionUbitUmarov2012-12-071-2/+2
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-4/+25
|\ \ | |/
| * *TEST* add some avatar skeleton information and use it to calculate avatarUbitUmarov2012-12-071-4/+25
| | | | | | | | height and bounding box. Change LSL acording.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-064-105/+85
|\ \ | |/
| * avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-054-105/+85
| | | | | | | | avatar collider, just rounding the boxes, etc
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-043-14/+47
|\ \ | |/
| * move characters (avatars) to own collision space, also fixing a problemUbitUmarov2012-12-043-14/+47
| | | | | | | | with previus code that was still assuming the avatar is g2
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-041-4/+4
|\ \ | |/
| * raise standing avatar a bit to reduce knees bending on some collisions.UbitUmarov2012-12-041-4/+4
| | | | | | | | reduce head size a bit
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-03311-10116/+20710
|\ \ | |/
| * Merge branch 'avination' into ubitworkMelanie2012-12-036-107/+383
| |\
| | * *TEST* diferent avatar colliderUbitUmarov2012-12-033-103/+350
| | |
| | * fix vertex rounding directionUbitUmarov2012-12-031-1/+8
| | |
| | * *TEST* reduce all mesh vertices resolution to 1e-5. This reduces numberUbitUmarov2012-12-031-0/+16
| | | | | | | | | | | | of unique vertices only originated by math errors in PrimMesher
| | * adjust avatar standing Z positionUbitUmarov2012-12-031-5/+11
| | |
| | * Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-032-3/+3
| | |
| * | don't zero constant force and torque in selectionUbitUmarov2012-11-241-6/+6
| | |
| * | avoid potencial NullReferenceExceptionUbitUmarov2012-11-241-2/+5
| |/
| * Remove a superfluous newline from helpMelanie2012-11-231-2/+2
| |
| * Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
| |\
| | * Merge branch 'master' into careminsterMelanie2012-11-237-33/+129
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| | | * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| | | * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | | | | | | | | | region restart if done from the viewer.
| | | * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-234-36/+51
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
| |/ /
| * | 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
| |\ \ | | |/