aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-181-2/+4
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Remove some debugging output form the loggerBlueWall2012-02-161-2/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-02-161-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Fix some logic mistakes where firstly osNpcCreate() without options was ↵Justin Clark-Casey (justincc)2012-02-161-2/+2
| | | | | | | | | | | | creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect. Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
* | Merge branch 'master' into careminsterMelanie2012-02-153-17/+72
|\ \ | |/
| * Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-6/+6
| |
| * Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| | | | | | | | | | | | too slow they would circumvent the cache (piling up on the network service and making the problem even worse). This condition happens frequently during permission checks.
| * Fix: get embedded objects from Notecard fails with activated ↵PixelTomsen2012-02-141-3/+3
| | | | | | | | | | | | FreeSwitchVoiceModul http://opensimulator.org/mantis/view.php?id=2607
* | Merge branch 'master' into careminsterMelanie2012-02-102-3/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-091-8/+7
| | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
* | Merge branch 'master' into careminsterMelanie2012-02-091-0/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-091-0/+3
| |
* | Push more NPC stuff into threadsMelanie2012-02-081-15/+22
| |
* | Merge branch 'master' into careminsterMelanie2012-02-043-16/+18
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-032-2/+2
| |\
| | * Fix: Covenant changed time not set ↵PixelTomsen2012-02-032-2/+2
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ↵Justin Clark-Casey (justincc)2012-02-031-14/+16
| |/ | | | | | | | | | | | | | | presence and population of m_avatars. This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated. Extending the lock is the easiest to understand solution rather than getting complicated with null checks. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
| * Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-022-2/+2
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-022-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-285-13/+35
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-282-3/+3
| | | | | | | | agent id anyway
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-283-10/+32
| | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon
* | Merge branch 'master' into careminsterMelanie2012-01-251-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * minor: correct text and usage for "image queues show" reigon console command.Justin Clark-Casey (justincc)2012-01-241-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-214-16/+76
|\ \ | |/
| * Telehub Support:BlueWall2012-01-202-0/+11
| | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
| * Add "image queues clear <first-name> <last-name>" console commandJustin Clark-Casey (justincc)2012-01-191-15/+60
| | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes
| * RegionReady:BlueWall2012-01-181-1/+5
| | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
* | Merge branch 'master' into careminsterMelanie2012-01-161-2/+5
|\ \ | |/
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-01-141-6/+51
|\ \ | |/ | | | | | | | | | | | | 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
| * Update RegionReadyModuleBlueWall2012-01-131-6/+51
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-122-16/+56
|\ \ | |/
| * Add remove test for unowned avatarsJustin Clark-Casey (justincc)2012-01-121-0/+20
| |
| * Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-4/+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.
| * refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-121-13/+36
| | | | | | | | methods and expose on interface for external calls.
* | Merge branch 'master' into careminsterMelanie2012-01-121-2/+2
|\ \ | |/
| * minor: Fix wrong column length in image queues reportJustin Clark-Casey (justincc)2012-01-101-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-19/+85
|\ \ | |/
| * rename "show image queue" to "show image queues" in line with other udp info ↵Justin Clark-Casey (justincc)2012-01-101-29/+8
| | | | | | | | | | | | commands. Eliminate redundant one line methods
| * Add "show image queue <first-name> <last-name>" region console commandJustin Clark-Casey (justincc)2012-01-101-1/+88
| | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-101-0/+50
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "app find <uuid-or-start-of-uuid>" command to find the appearance using ↵Justin Clark-Casey (justincc)2012-01-101-0/+50
| | | | | | | | | | | | a particular baked texture, if any. This is for debugging to relate texture console entries back to particular users on the simulator end.
| * Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-063-11/+36
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-063-11/+36
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Merge branch 'master' into careminsterMelanie2012-01-064-7/+351
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-3/+13
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-0/+145
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Make "show asset" command available simulator side. Actually make the ↵Justin Clark-Casey (justincc)2012-01-051-0/+51
| | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message.
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-052-3/+136
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
generated by cgit v1.1 at 2024-11-08 20:39:18 +0000