aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* minor changes on updates control on doChangeObject(..)UbitUmarov2012-03-111-10/+48
|
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-115-7/+121
|\
| * Merge branch 'master' into careminsterMelanie2012-03-095-7/+121
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-094-6/+85
| | |\
| | | * More on inventory transfer hold ups:Diva Canto2012-03-093-5/+84
| | | | | | | | | | | | | | | | | | | | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
| | | * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-092-2/+2
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-084-88/+36
| | | |\
| | | * | More on the freeze on HG inventory transfers: spawn a threadlet on the ↵Diva Canto2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
| | * | | fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| | | |/ | | |/|
* | | | Changed undo redo internals. moved exec code to UndoState.cs from sop that ↵UbitUmarov2012-03-112-136/+195
| | | | | | | | | | | | | | | | now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
* | | | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-1010-139/+543
| | | | | | | | | | | | | | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* | | | ubitOde bugUbitUmarov2012-03-091-2/+4
| | | |
* | | | on linking update linked parts physical flags acording to new parent ones ( ↵UbitUmarov2012-03-091-1/+8
|/ / / | | | | | | | | | untested )
* | | Merge branch 'ubitwork'Melanie2012-03-092-0/+7
|\ \ \
| * | | let chode and ubitode find ode.dll on windowsUbitUmarov2012-03-092-0/+7
| | | |
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-091-4/+5
| |\ \ \
| * \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-09133-1036/+2549
| |\ \ \ \
* | | | | | Fix UbitODE dll mappping by simply copying the one from ODE.NetMelanie2012-03-093-6/+6
| |_|/ / / |/| | | |
* | | | | Merge branch 'ubitwork'Melanie2012-03-094-112/+194
|\ \ \ \ \ | |/ / / /
| * | | | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-092-14/+9
| | | | |
| * | | | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-093-100/+187
| | | | | | | | | | | | | | | | | | | | we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
* | | | | Fix a merge artefactMelanie2012-03-091-4/+5
| |/ / / |/| | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-095-93/+60
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)2012-03-092-12/+3
| | | | | | | | | | | | | | | | This is rather than checking whether the avatar is sitting and doing its own calculation.
| * | | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since ↵Justin Clark-Casey (justincc)2012-03-091-2/+2
| | | | | | | | | | | | | | | | this is handled by the necessary ParentPart check
| * | | Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)2012-03-094-68/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
| * | | refactor: cleanup SP.HandleAgentSit so that everything is done within one if ↵Justin Clark-Casey (justincc)2012-03-091-15/+8
| | |/ | |/| | | | | | | (part != null), rather than having unnecessary multiple checks
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-087-49/+798
| |\ \
| | * | Remove a race condition from SP.Set_AbsolutePosition where we assume the ↵Justin Clark-Casey (justincc)2012-03-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | ParentPart is still not null if the ParentID != 0 Another thread could come in and stand the avatar between those two instructions.
| * | | HG inventory/asset transfers: serialize asset posts. I'm using the same ↵Diva Canto2012-03-081-1/+20
| | | | | | | | | | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works.
* | | | Merge branch 'master' into careminsterMelanie2012-03-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-096-5/+750
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-092-29/+32
| |\ \ \ | | |/ /
| | * | Fixes mantis #5923Diva Canto2012-03-081-2/+3
| | | |
| * | | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-095-3/+747
| |\ \ \
| | * | | minor: move some compression related var setup inside compression if/then switchJustin Clark-Casey (justincc)2012-03-091-4/+3
| | | | |
| | * | | Put big fat EXPERIMENTAL warning in xassetservice database pluginJustin Clark-Casey (justincc)2012-03-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | This should not currently be used in any circumstances except for experimentation. Database tables used by this plugin can still change at any time with no migration path.
| | * | | Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-063-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
| | * | | remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
| | | | |
| | * | | Make asset compression optional. Currently set to false and not ↵Justin Clark-Casey (justincc)2012-03-031-16/+24
| | | | | | | | | | | | | | | | | | | | configurable from outside MySQLXAssetData.
| | * | | Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether this is worthwhile is debatable since here we are not transmitting data over a network In addition, jpeg2000 (the biggest data hog) is already a compressed image format. May not remain.
| | * | | If asset data already exists with the required hash then don't rewrite itJustin Clark-Casey (justincc)2012-03-031-17/+59
| | | | |
| | * | | Perform asset storage transactionallyJustin Clark-Casey (justincc)2012-03-021-57/+69
| | | | |
| | * | | Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
| | |\ \ \
| | * | | | Make xassetservice execute one query to retrieve the asset, not twoJustin Clark-Casey (justincc)2012-03-021-28/+4
| | | | | |
| | * | | | Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
| | |\ \ \ \
| | * | | | | Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-022-0/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.
| | * | | | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-022-2/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* | | | | | | Merge branch 'master' into careminsterMelanie2012-03-080-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
generated by cgit v1.1 at 2024-11-10 14:14:21 +0000