aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-052-36/+12
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-052-1/+4
| | |\
| | * | Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-052-36/+12
| | | | | | | | | | | | | | | | numbered properly even when sets are linked to sets.
| * | | Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-054-14/+61
| | |/ | |/| | | | | | | | | | | | | | | | | | | This is to partially address http://opensimulator.org/mantis/view.php?id=5769 We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger. By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>. However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent). Hopefully this can be addressed soon.
| * | Add comment for experimental effect of removing the Thread.Sleep(20) in ↵Justin Clark-Casey (justincc)2011-11-042-1/+4
| |/ | | | | | | ODEPrim.changevelocity()
* | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+28
|\ \ | |/
| * On standup, trigger the changed link script event after the avatar has been ↵Justin Clark-Casey (justincc)2011-11-041-2/+3
| | | | | | | | | | | | | | | | fully changed. This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work. Probably the event is fired before the physics actor has been set up again for the stood avatar. Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
| * Stop llPushObject() from causing problems by adding force via a taint rather ↵Justin Clark-Casey (justincc)2011-11-041-2/+25
| | | | | | | | | | | | | | than directly. This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing. Needs careful locking in the future.
* | Merge branch 'master' into bigmergeMelanie2011-11-0424-234/+424
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-0316-35/+35
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-0323-154/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
| * remove the pointless check of the face texture struct against null in ↵Justin Clark-Casey (justincc)2011-11-031-3/+1
| | | | | | | | Bot.Objects_NewPrim()
| * actually remove the sleep from PhysicsBehaviour that I shifted to Bot a ↵Justin Clark-Casey (justincc)2011-11-031-2/+0
| | | | | | | | couple of commits ago
| * Rename PhysicsBot => Bot since it doesn't just exercise physics anymoreJustin Clark-Casey (justincc)2011-11-035-12/+12
| |
| * Move one of the old physics sleeps out into the main bot loop, so leaving ↵Justin Clark-Casey (justincc)2011-11-031-0/+2
| | | | | | | | out PhysicsBehaviour doesn't result in continuous other behaviours
| * Add click/grab behaviour to pCampbot, which gets bots to randomly click things.Justin Clark-Casey (justincc)2011-11-035-8/+105
| | | | | | | | | | | | | | This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch e.g. -b p,g to get both existing physics and grabbing behaviours. grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not. behaviour is currently primitive overall, behaviours are just executed in a list
| * Move PhysicsBehaviour into a spearate behaviours folderJustin Clark-Casey (justincc)2011-11-033-3/+2
| |
| * Separate out physics testing actions into a separate PhysicsBehaviour classJustin Clark-Casey (justincc)2011-11-035-95/+221
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-0316-116/+115
| |\
| | * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
| | | | | | | | | | | | | | | not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5
| * | Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-022-2/+2
| | | | | | | | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ \ | | |/ | |/|
| * | Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
| | | | | | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-0216-114/+121
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-11-024-23/+37
| | |\ \
| | * | | fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
| | | | |
| * | | | Merge branch 'master' into bigmergeMelanie2011-11-0315-113/+120
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-0215-107/+117
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-026-330/+402
| | | |\ \ | | | | |/
| | | | * Get some hopefully more useful exception information when ↵Justin Clark-Casey (justincc)2011-11-022-5/+8
| | | | | | | | | | | | | | | | | | | | OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
| | | | * Fix race condition that would sometimes send or save appearance for the ↵Justin Clark-Casey (justincc)2011-11-022-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong avatar. In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread. If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched. This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent. This change loads the fields into local references so that this doesn't happen.
| | | | * Catch any exceptions exiting the top of the robust console, as we already do ↵Justin Clark-Casey (justincc)2011-11-021-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the main simulator. This prevents issues such as transient mono console problems from crashing the server.
| | | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-0211-92/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
| | * | | Port the Avination offline messaging system to CoreMelanie2011-11-024-23/+37
| | | |/ | | |/|
* | | | Fix link order when linking sets to setsMelanie2011-11-022-40/+18
|/ / /
* | | Merge branch 'master' into bigmergeMelanie2011-11-021-322/+350
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Restore the recursive calling of PRIM_LINK_TARGET because the version I madeMelanie2011-11-021-327/+334
| | | | | | | | | | | | breaks LINK_SET et al.
| * | Some positioning fixes from AVN trunkMelanie2011-11-021-1/+42
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-022-6/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenarioMelanie2011-11-021-4/+3
| |/
| * Removed redundant SceneContents property from Scene. It's the same as ↵Dan Lake2011-11-012-6/+1
| | | | | | | | SceneGraph property.
* | Merge branch 'master' into bigmergeMelanie2011-11-021-10/+7
|\ \ | |/
| * Part 2 of see_into_this_sim_from_neighbor configuration option removalDan Lake2011-11-011-10/+7
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-0116-786/+255
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-012-11/+1
| |
| * Add "appearance send" command to allow manual sending of appearance.Justin Clark-Casey (justincc)2011-11-013-6/+23
| |
| * Add "show status" command to pCambotJustin Clark-Casey (justincc)2011-11-012-22/+45
| |
| * Listen only for non SimShutdown Network.Disconnect firing so that we don't ↵Justin Clark-Casey (justincc)2011-11-011-1/+7
| | | | | | | | quite the program before all bots have actually logged off.
| * get rid of unused m_verbose fieldJustin Clark-Casey (justincc)2011-11-011-1/+0
| |
generated by cgit v1.1 at 2024-12-15 00:51:53 +0000