aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* change OfflineMessageModule from new avination code to original master, for ↵UbitUmarov2015-11-061-4/+20
| | | | compatibility with current web servers php scripts. This may change after current test phase
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-011-3/+12
|
* fix more merge issuesUbitUmarov2015-11-011-5/+5
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-012-12/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Remove testing cruft that is blocking the new protocols. Unit tests noMelanie Thielker2015-10-311-0/+2
| | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway.
| * let silly tests override version on local connectionsUbitUmarov2015-10-311-1/+1
| |
| * Make sure the chat module doesn't deactivate just because the sectionMelanie Thielker2015-09-091-12/+8
| | | | | | | | heading is missing
* | Make changes to a friend rights reach him on another sim; find on map does ↵UbitUmarov2015-10-262-17/+78
| | | | | | | | show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing...
* | make bakes reception handle empty BakedTexture elements. But at same time ↵UbitUmarov2015-10-011-36/+36
| | | | | | | | stop sending them, only sending to Xbakes server items that do have a texture, like master does
* | add missing handlers for preferencesUbitUmarov2015-09-281-0/+4
| |
* | add the Default Groups module lost in the mergeUbitUmarov2015-09-261-0/+260
| |
* | remove bad merge from masterUbitUmarov2015-09-161-12/+0
| |
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-0810-10/+0
|\ \ | |/ | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-0410-10/+0
| | | | | | | | OpenSim.Framework.
* | seems to compile ( tests comented out)UbitUmarov2015-09-0210-174/+104
| |
* | bad merge?UbitUmarov2015-09-0116-532/+1238
|\ \ | |/ |/|
| * Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-192-7/+5
| |\
| | * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-292-7/+5
| | | | | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * | Make the scripted dialogs and restart message appear in the top right cornerMelanie Thielker2015-03-231-2/+2
| |/ | | | | | | | | | | again. Viewers have been busy making these notifications all into toasts but we believe there are message that are important enough to make the user acknowledge them.
| * Remove braindead "fix" that messed up intersim scripted giving.Melanie Thielker2014-11-211-11/+0
| |
| * Remove the Invisible stuff and add more baked caching. Refactor selection of ↵Melanie Thielker2014-11-111-13/+3
| | | | | | | | textures to save to Bakes module.
| * Only send the actual bakes to the bakes moduleMelanie Thielker2014-11-101-6/+8
| |
| * change last commit, need to send to Xbakes or changes will not be detectedUbitUmarov2014-10-291-1/+2
| |
| * bug fix and don't send to xbakes if requesting rebakesUbitUmarov2014-10-291-12/+13
| |
| * Fix baked textures for regions without external Xbakes adding rebakeUbitUmarov2014-10-291-32/+35
| | | | | | | | | | | | requests. Those may also be trigger if for same reason one is missing even with Xbakes. Later we can let this regions send the assets on teleports, changing how those are serialized
| * do consider skirt baked texture on validationUbitUmarov2014-10-261-3/+9
| |
| * dont send baked textures assets, but send cache informationUbitUmarov2014-10-261-5/+13
| |
| * exclude npcs from baked cacheUbitUmarov2014-09-191-0/+10
| |
| * ... and a few more..UbitUmarov2014-09-171-18/+31
| |
| * remove messing with KeyframeMotion on attachUbitUmarov2014-09-091-2/+2
| |
| * drop attachments with original physical proprietiesUbitUmarov2014-09-091-21/+6
| |
| * on drop send full update on root prim, terse on others ( as sl ). FixUbitUmarov2014-09-081-2/+5
| | | | | | | | count down of number of physicial prims on attach, if removing them
| * change attachment drop, to make object Phanton. THis is not as SL, butUbitUmarov2014-09-081-8/+12
| | | | | | | | | | rez position is automatic and object interpenetrations will happen including with the avatar, with the usual ugly effects.
| * *NEEDS more testing* on attachment drop: fix adding prims to physicsUbitUmarov2014-09-081-4/+31
| | | | | | | | | | | | | | engine, remove disturbing phantom flag. On attach: fix removing prims from physics engine, delete any keyframeMotion, remove physical flag. This is executed in all attachs possible only need on attach from the scene (?), but its where original code removed only root part from physics engine
| * try external bakedModule when local cache is invalid and not just at loginUbitUmarov2014-08-141-9/+13
| |
| * reduced debug msgsUbitUmarov2014-08-141-3/+7
| |
| * only try external baked texture module on loginUbitUmarov2014-08-141-26/+36
| |
| * *DANGER* make baked textures cross and make use of it * UNTESTED *UbitUmarov2014-08-141-95/+92
| | | | | | | | issue: alll this seems to be sent back to childs, need to stop that
| * put back baked textures debug msgs at start of validatebaked...UbitUmarov2014-08-131-0/+12
| |
| * remove confusing defonly controlUbitUmarov2014-08-111-14/+4
| |
| * ... one day..UbitUmarov2014-08-111-1/+2
| |
| * will get there..UbitUmarov2014-08-111-4/+3
| |
| * validatebaked still not okUbitUmarov2014-08-111-5/+4
| |
| * of course.. bug..UbitUmarov2014-08-081-1/+2
| |
| * lock set appearence during ValidateBakedTextureCache there seems to be aUbitUmarov2014-08-081-93/+97
| | | | | | | | overlap in same cases
| * bugUbitUmarov2014-08-071-1/+2
| |
| * remove annoying debug msg . still a lot of spam, but to remove laterUbitUmarov2014-08-071-1/+1
| |
| * make grid baked textures override the ones on appearance. Due to bugUbitUmarov2014-08-071-35/+60
| | | | | | | | | | | | somewhere they are always bad at ValidateBakedTextures entry. ( even if they where good and on assets cache we whould need to generate the cacheID hash )
| * bug on upload new bakes decisionUbitUmarov2014-08-071-2/+3
| |
| * minor clean, dont check for cache if we aren't using it..UbitUmarov2014-08-071-23/+5
| |