aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-111-34/+2
|\
| * Merge branch 'master' into careminsterMelanie2012-03-111-34/+2
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| | * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-34/+2
| | | | | | | | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* | | Merge branch 'ubitwork'Melanie2012-03-112-0/+2
|\ \ \ | |/ / |/| |
| * | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-102-0/+2
| | | | | | | | | | | | 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 ****
* | | Merge branch 'master' into careminsterMelanie2012-03-091-1/+36
|\ \ \ | |/ / |/| / | |/
| * fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| |
* | Merge branch 'master' into careminsterMelanie2012-03-085-27/+27
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-085-27/+27
| | | | | | | | | | | | | | | | | | | | | | <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-071-1/+7
|\ \ | | | | | | | | | careminster
| * | Prevent scripted region crossings from crashing with prim limits enabledMelanie2012-03-061-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-061-61/+56
|\ \ \ | | |/ | |/|
| * | 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-041-1/+4
|\ \ \ | | |/ | |/| | | | careminster
| * | Fix NPC appearance setting to include attachments againMelanie2012-02-271-1/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-242-2/+2
|\ \ \ | |/ / |/| / | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-2/+2
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | 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
generated by cgit v1.1 at 2024-10-24 21:16:42 +0000