Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent scripted region crossings from crashing with prim limits enabled | Melanie | 2012-03-06 | 1 | -1/+7 |
| | |||||
* | Fix NPC appearance setting to include attachments again | Melanie | 2012-02-27 | 1 | -1/+4 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -2/+4 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| * | Remove some debugging output form the logger | BlueWall | 2012-02-16 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-16 | 1 | -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-16 | 1 | -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 careminster | Melanie | 2012-02-15 | 3 | -17/+72 |
|\ \ | |/ | |||||
| * | Refactor appearance saving for NPC to use AvatarFactoryModule interface. | Dan Lake | 2012-02-14 | 1 | -6/+6 |
| | | |||||
| * | Fix a race condition in the simian groups connector. When requests were | Mic Bowman | 2012-02-13 | 1 | -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 ↵ | PixelTomsen | 2012-02-14 | 1 | -3/+3 |
| | | | | | | | | | | | | FreeSwitchVoiceModul http://opensimulator.org/mantis/view.php?id=2607 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 2 | -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-09 | 1 | -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 careminster | Melanie | 2012-02-09 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | minor: put in commented out logging statements for future reuse | Justin Clark-Casey (justincc) | 2012-02-09 | 1 | -0/+3 |
| | | |||||
* | | Push more NPC stuff into threads | Melanie | 2012-02-08 | 1 | -15/+22 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 3 | -16/+18 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 2 | -2/+2 |
| |\ | |||||
| | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 2 | -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-03 | 1 | -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 more | Melanie | 2012-02-02 | 2 | -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. | Melanie | 2012-02-02 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 5 | -13/+35 |
|\ \ | |/ | |||||
| * | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 2 | -3/+3 |
| | | | | | | | | agent id anyway | ||||
| * | Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). | Justin Clark-Casey (justincc) | 2012-01-28 | 3 | -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 careminster | Melanie | 2012-01-25 | 1 | -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-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 4 | -16/+76 |
|\ \ | |/ | |||||
| * | Telehub Support: | BlueWall | 2012-01-20 | 2 | -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 command | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -15/+60 |
| | | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes | ||||
| * | RegionReady: | BlueWall | 2012-01-18 | 1 | -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 careminster | Melanie | 2012-01-16 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | protect the region ready alerts for loading oarfiles if no post URI is set | Mic Bowman | 2012-01-14 | 1 | -2/+5 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 1 | -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 RegionReadyModule | BlueWall | 2012-01-13 | 1 | -6/+51 |
| | | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 2 | -16/+56 |
|\ \ | |/ | |||||
| * | Add remove test for unowned avatars | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -0/+20 |
| | | |||||
| * | Add permissions checks for owned avatars to all other osNpc* functions. | Justin Clark-Casey (justincc) | 2012-01-12 | 1 | -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-12 | 1 | -13/+36 |
| | | | | | | | | methods and expose on interface for external calls. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | minor: Fix wrong column length in image queues report | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -19/+85 |
|\ \ | |/ | |||||
| * | rename "show image queue" to "show image queues" in line with other udp info ↵ | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -29/+8 |
| | | | | | | | | | | | | commands. Eliminate redundant one line methods | ||||
| * | Add "show image queue <first-name> <last-name>" region console command | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -1/+88 |
| | | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -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-10 | 1 | -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 ↵ | Melanie | 2012-01-06 | 3 | -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 ↵ | Melanie | 2012-01-06 | 3 | -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 careminster | Melanie | 2012-01-06 | 4 | -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-05 | 1 | -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-05 | 1 | -0/+145 |
| | | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes. |