aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Cause prims to be saved if extra physics parameters are changedMelanie2012-03-201-0/+5
|
* Merge branch 'master' into careminsterMelanie2012-03-203-18/+12
|\ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| |
| * Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| |
| * Add some doc about the EventManager.OnLoginsEnabled event.Justin Clark-Casey (justincc)2012-03-191-0/+7
| |
* | Merge branch 'ubitwork'Melanie2012-03-192-0/+158
|\ \
| * | some more work on costsUbitUmarov2012-03-162-0/+158
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-187-118/+79
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ↵Diva Canto2012-03-172-55/+0
| | | | | | | | UserManagementModule where it belongs. No functional changes.
| * Region access control! Region operators can now specify things like ↵Diva Canto2012-03-171-2/+2
| | | | | | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
| * Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-162-18/+53
| | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
| * Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)2012-03-161-1/+4
| | | | | | | | This is for the top scripts report.
| * Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)2012-03-163-39/+10
| | | | | | | | | | | | | | | | | | | | | | measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-151-0/+10
| | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
* | Merge branch 'ubitwork'Melanie2012-03-155-19/+84
|\ \
| * | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-153-1/+4
| | | | | | | | | | | | For now on caps/EventQueue, and still only used on a material change...
| * | bug fixs, added a default physics shape estimator based on being a mesh or ↵UbitUmarov2012-03-143-18/+80
| | | | | | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
* | | Merge branch 'master' into careminsterMelanie2012-03-151-10/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix a problem where multiple near simultaneous calls to llDie() from ↵Justin Clark-Casey (justincc)2012-03-151-10/+1
| | | | | | | | | | | | | | | | | | | | multiple scripts in the same linkset can cause unnecessary thread aborts. The first llDie() could lock Scene.m_deleting_scene_object. The second llDie() would then wait at this lock. The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away. Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead. This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
* | missed commit of extraphysics parameters serialization..UbitUmarov2012-03-131-6/+46
| |
* | let PhysicsShapeType none remove physics remove physics on child parts ↵UbitUmarov2012-03-131-10/+38
| | | | | | | | **UnTested**
* | bug fixUbitUmarov2012-03-131-2/+2
| |
* | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵UbitUmarov2012-03-131-1/+1
| | | | | | | | with it disabled...
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-131-2/+2
|\ \
| * | Ensure child prims of a phantom prim are marked as phantomMelanie2012-03-131-2/+2
| | |
* | | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵UbitUmarov2012-03-134-17/+205
|/ / | | | | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-134-149/+37
| | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type!
* | Restore duplication of the SL bug where linking phantom to solid lets theMelanie2012-03-121-3/+2
| | | | | | | | child prim remain phantom
* | allocate UndoRedoStore only on demandUbitUmarov2012-03-121-10/+17
| |
* | Physical phantoms testable with chOde. Volume detection was changed and ↵UbitUmarov2012-03-111-138/+145
| | | | | | | | also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
* | bug fix (??) in sog copy()UbitUmarov2012-03-111-10/+19
| |
* | cleanup + commentsUbitUmarov2012-03-111-167/+52
| |
* | coments change..UbitUmarov2012-03-111-3/+3
| |
* | 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-111-1/+1
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-091-1/+1
| |\ \ | | |/
| | * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
| | |
* | | 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-105-126/+394
| | | | | | | | | | | | 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 ****
* | | on linking update linked parts physical flags acording to new parent ones ( ↵UbitUmarov2012-03-091-1/+8
|/ / | | | | | | untested )
* | Merge branch 'ubitwork'Melanie2012-03-093-45/+39
|\ \
| * | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-091-12/+6
| | |
| * | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-092-33/+33
| | | | | | | | | | | | 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
* | | Merge branch 'master' into careminsterMelanie2012-03-092-55/+30
|\ \ \ | | |/ | |/| | | | | | | | | | 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-091-5/+1
| | | | | | | | | | | | 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-092-32/+18
| | | | | | | | | | | | | | | | | | | | | (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
| * | 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.
| * | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
| | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
generated by cgit v1.1 at 2024-11-08 19:59:47 +0000