aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-262-89/+108
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵Justin Clark-Casey (justincc)2012-01-262-31/+34
| | | | | | | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity.
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵Justin Clark-Casey (justincc)2012-01-251-79/+95
| | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim()
* | Merge branch 'master' into careminsterMelanie2012-01-251-6/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵Dan Lake2012-01-241-6/+0
| | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate
* | Merge branch 'master' into careminsterMelanie2012-01-251-12/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵Dan Lake2012-01-241-13/+0
| | | | | | | | OnObjectDuplicate
| * Teleport routing, part 1Melanie2012-01-241-0/+53
| |
* | Add handling bans properlyMelanie2012-01-241-1/+1
| |
* | Add teleport routing, first partMelanie2012-01-241-0/+59
| |
* | Merge branch 'master' into careminsterMelanie2012-01-161-1/+1
|\ \ | |/
| * Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | | | adjustment commit. Left in the method doc.
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Fix mergeMelanie2012-01-141-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-143-34/+81
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-141-0/+13
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-132-45/+30
| | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength).
| * Update RegionReadyModuleBlueWall2012-01-131-0/+38
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-131-3/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-121-3/+0
| | | | | | | | Move some added fuctions out of core into the addon module to keep things clean
* | Merge branch 'master' into careminsterMelanie2012-01-132-0/+73
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-122-2/+10
| |\
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+73
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-122-2/+10
|\ \ \ | | |/ | |/|
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-1/+1
| | | | | | | | | | | | This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-123-7/+7
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-121-1/+1
| | |/
| * | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-121-0/+8
| | | | | | | | | | | | methods and expose on interface for external calls.
* | | Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\ \ \ | | |/ | |/|
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-6/+6
| |/ | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+1
| | | | | | | | rather than halting the IAR load with an exception.
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | HG landing points: this hopefully fixes some confusion that was making HG ↵Diva Canto2012-01-101-5/+6
| | | | | | | | | | | | avies always land in 0,0
* | | Merge branch 'master' into careminsterMelanie2012-01-102-19/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/ | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| | | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
| * TP Routing debugBlueWall2012-01-091-2/+5
| | | | | | | | Fix test to checking against bitfield instead of int
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| | | | | | | | Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18
| | | | | | | | Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| | | | | | | | Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
| * Fix a build breakMelanie2012-01-091-1/+1
| |
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| |
| * Update teleport routing to match AvinationMelanie2012-01-081-16/+58
| |
| * Fix teleport routingBlueWall2012-01-081-0/+17
| | | | | | | | Route non-owner avatars according to land settings
* | Update teleport routing to match AvinationMelanie2012-01-081-1/+2
| |
generated by cgit v1.1 at 2024-12-22 01:27:15 +0000