aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-108-139/+539
| | | | 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 )
* 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-0968-809/+1241
|\
| * Merge branch 'master' into careminsterMelanie2012-03-094-92/+40
| |\ | | | | | | | | | | | | | | | 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
| | * 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.
| | * FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| | |
| * | Merge branch 'master' into careminsterMelanie2012-03-091-2/+5
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-091-27/+29
| | |\
| | | * 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.
| | * | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-2/+5
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
| | | |\
| | | * \ Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
| | | |\ \
| | | * | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0826-184/+206
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | |
| | * | | | Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | |
| | * | | | Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-083-45/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-081-4/+1
| | |\ \ \ \
| | * | | | | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-0826-143/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-084-180/+96
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-071-2/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | | | | Always zero the PhysActor on dupes to prevent side effects on the orignal primMelanie2012-03-071-4/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Fix merge issueMelanie2012-03-071-76/+79
| | | | | | |
| * | | | | | Merge branch 'master' into careminsterMelanie2012-03-0720-100/+438
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | | Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-071-28/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this.
| | * | | | | Add documentation to make more explicit the difference between OnRezScript ↵Justin Clark-Casey (justincc)2012-03-071-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OnNewScript in the event manager OnNewScript fires when a script is added to a scene OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
| | * | | | | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case. Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
| | * | | | | Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-068-12/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status" command. This is for diagnostic purposes.
| | * | | | | Remove unnecessary explicit ElapsedEventHandler in SimReporterJustin Clark-Casey (justincc)2012-03-061-1/+1
| | | | | | |
| | * | | | | Explictly close down the StatsReporter so that we can shutdown its timerJustin Clark-Casey (justincc)2012-03-062-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another step necessary for the scene to be garbage collected between performance tests
| | * | | | | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-061-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were all failing assertions but the exceptions these threw were caught as expected Exceptions. I don't think we can easily distinguish these from the Exceptions that we're expecting. So for now we'll do some messy manually checking with boolean setting instead. This patch also corrects the assertions themselves.
| | * | | | | Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ↵Justin Clark-Casey (justincc)2012-03-068-26/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | they're running
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0710-803/+871
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-062-62/+57
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix off by one error in script error reporting.Justin Clark-Casey (justincc)2012-03-061-1/+1
| | | | | | | |
| | * | | | | | Simplify NPCModuleTests code by putting the NPCModule in an instance ↵Justin Clark-Casey (justincc)2012-03-061-61/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable rather than making each test fetch it seperately. Also rename instance variables in the test to conform to naming standards and for understandability
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-03-062-12/+57
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| | * | | | | | Go back to setting appearance directly in NPCModule.SetAppearance() to fix ↵Justin Clark-Casey (justincc)2012-03-062-9/+57
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mantis 5914 The part reverted is from commit 2ebb421. Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments. I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :) Regression test added for this case. Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-064-10/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0422-695/+1305
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| | * | | | | | | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0312-221/+193
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | | | | | | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript()
generated by cgit v1.1 at 2025-01-04 07:34:31 +0000