Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change OfflineMessageModule from new avination code to original master, for ↵ | UbitUmarov | 2015-11-06 | 1 | -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 Thielker | 2015-11-01 | 1 | -3/+12 |
| | |||||
* | fix more merge issues | UbitUmarov | 2015-11-01 | 1 | -5/+5 |
| | |||||
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 2 | -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 no | Melanie Thielker | 2015-10-31 | 1 | -0/+2 |
| | | | | | | | | | | longer test TP v1 now. TP v1 will be removed within 6 months anyway. | ||||
| * | let silly tests override version on local connections | UbitUmarov | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Make sure the chat module doesn't deactivate just because the section | Melanie Thielker | 2015-09-09 | 1 | -12/+8 |
| | | | | | | | | heading is missing | ||||
* | | Make changes to a friend rights reach him on another sim; find on map does ↵ | UbitUmarov | 2015-10-26 | 2 | -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 ↵ | UbitUmarov | 2015-10-01 | 1 | -36/+36 |
| | | | | | | | | stop sending them, only sending to Xbakes server items that do have a texture, like master does | ||||
* | | add missing handlers for preferences | UbitUmarov | 2015-09-28 | 1 | -0/+4 |
| | | |||||
* | | add the Default Groups module lost in the merge | UbitUmarov | 2015-09-26 | 1 | -0/+260 |
| | | |||||
* | | remove bad merge from master | UbitUmarov | 2015-09-16 | 1 | -12/+0 |
| | | |||||
* | | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 10 | -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 Canto | 2015-09-04 | 10 | -10/+0 |
| | | | | | | | | OpenSim.Framework. | ||||
* | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 10 | -174/+104 |
| | | |||||
* | | bad merge? | UbitUmarov | 2015-09-01 | 16 | -532/+1238 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'mbworkvar2' into ubitvar | UbitUmarov | 2015-08-19 | 2 | -7/+5 |
| |\ | |||||
| | * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 2 | -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 corner | Melanie Thielker | 2015-03-23 | 1 | -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 Thielker | 2014-11-21 | 1 | -11/+0 |
| | | |||||
| * | Remove the Invisible stuff and add more baked caching. Refactor selection of ↵ | Melanie Thielker | 2014-11-11 | 1 | -13/+3 |
| | | | | | | | | textures to save to Bakes module. | ||||
| * | Only send the actual bakes to the bakes module | Melanie Thielker | 2014-11-10 | 1 | -6/+8 |
| | | |||||
| * | change last commit, need to send to Xbakes or changes will not be detected | UbitUmarov | 2014-10-29 | 1 | -1/+2 |
| | | |||||
| * | bug fix and don't send to xbakes if requesting rebakes | UbitUmarov | 2014-10-29 | 1 | -12/+13 |
| | | |||||
| * | Fix baked textures for regions without external Xbakes adding rebake | UbitUmarov | 2014-10-29 | 1 | -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 validation | UbitUmarov | 2014-10-26 | 1 | -3/+9 |
| | | |||||
| * | dont send baked textures assets, but send cache information | UbitUmarov | 2014-10-26 | 1 | -5/+13 |
| | | |||||
| * | exclude npcs from baked cache | UbitUmarov | 2014-09-19 | 1 | -0/+10 |
| | | |||||
| * | ... and a few more.. | UbitUmarov | 2014-09-17 | 1 | -18/+31 |
| | | |||||
| * | remove messing with KeyframeMotion on attach | UbitUmarov | 2014-09-09 | 1 | -2/+2 |
| | | |||||
| * | drop attachments with original physical proprieties | UbitUmarov | 2014-09-09 | 1 | -21/+6 |
| | | |||||
| * | on drop send full update on root prim, terse on others ( as sl ). Fix | UbitUmarov | 2014-09-08 | 1 | -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, but | UbitUmarov | 2014-09-08 | 1 | -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 physics | UbitUmarov | 2014-09-08 | 1 | -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 login | UbitUmarov | 2014-08-14 | 1 | -9/+13 |
| | | |||||
| * | reduced debug msgs | UbitUmarov | 2014-08-14 | 1 | -3/+7 |
| | | |||||
| * | only try external baked texture module on login | UbitUmarov | 2014-08-14 | 1 | -26/+36 |
| | | |||||
| * | *DANGER* make baked textures cross and make use of it * UNTESTED * | UbitUmarov | 2014-08-14 | 1 | -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... | UbitUmarov | 2014-08-13 | 1 | -0/+12 |
| | | |||||
| * | remove confusing defonly control | UbitUmarov | 2014-08-11 | 1 | -14/+4 |
| | | |||||
| * | ... one day.. | UbitUmarov | 2014-08-11 | 1 | -1/+2 |
| | | |||||
| * | will get there.. | UbitUmarov | 2014-08-11 | 1 | -4/+3 |
| | | |||||
| * | validatebaked still not ok | UbitUmarov | 2014-08-11 | 1 | -5/+4 |
| | | |||||
| * | of course.. bug.. | UbitUmarov | 2014-08-08 | 1 | -1/+2 |
| | | |||||
| * | lock set appearence during ValidateBakedTextureCache there seems to be a | UbitUmarov | 2014-08-08 | 1 | -93/+97 |
| | | | | | | | | overlap in same cases | ||||
| * | bug | UbitUmarov | 2014-08-07 | 1 | -1/+2 |
| | | |||||
| * | remove annoying debug msg . still a lot of spam, but to remove later | UbitUmarov | 2014-08-07 | 1 | -1/+1 |
| | | |||||
| * | make grid baked textures override the ones on appearance. Due to bug | UbitUmarov | 2014-08-07 | 1 | -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 decision | UbitUmarov | 2014-08-07 | 1 | -2/+3 |
| | | |||||
| * | minor clean, dont check for cache if we aren't using it.. | UbitUmarov | 2014-08-07 | 1 | -23/+5 |
| | |