aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-03-062-62/+57
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix off by one error in script error reporting.Justin Clark-Casey (justincc)2012-03-061-1/+1
| | | | | | | |
| | * | | | | | 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-064-10/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0422-695/+1305
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| | * | | | | | | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0312-221/+193
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | | | | | | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript()
| | * | | | | | | Allow a script to receive events if its root prim is in an area where it's ↵Justin Clark-Casey (justincc)2012-03-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-022-4/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-03-021-2/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| | | | | | | | |
| | * | | | | | | ScenePresence line endings and fix AllowMovement default to true.Dan Lake2012-03-021-30/+30
| | |/ / / / / /
| | * | | | | | In ScenePresence, removed several private variables used to store public ↵Dan Lake2012-03-011-108/+44
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | parameters. They were only used by the get/set and make code harder to refactor.
| | * | | | | Move SenseRepeaters.Count check inside the SenseRepeatListLock.Justin Clark-Casey (justincc)2012-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No methods in the List class are thread safe in the MS specification/documentation
| | * | | | | lock SenseRepeatListLock when added a new sensor during script reconstitution.Justin Clark-Casey (justincc)2012-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already being done in the other place where a sensor is added. Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
| | * | | | | Adds an OSSL command for regular expression-based string replacement. ParametersMic Bowman2012-03-013-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are osReplaceString(string source, string patter, string replace, integer count, integer start) The count parameter specifies the total number of replacements to make, -1 makes all replacements.
| | * | | | | Fix indexing on string trimBlueWall2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to zadark for pointing this out, smxy for deciphering the ?: operator and Plugh for the fix \o/ yay for IRC
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-294-21/+25
| | |\ \ \ \ \
| | | * | | | | Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| | | * | | | | HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵Diva Canto2012-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there.
| | * | | | | | Call Dispose() via using() on SqliteCommands in WebStatsModule after use.Justin Clark-Casey (justincc)2012-02-281-99/+98
| | | | | | | |
| * | | | | | | Merge branch 'master' into careminsterMelanie2012-02-254-34/+111
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| | * | | | | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implementedPixelTomsen2012-02-252-4/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763
| | * | | | | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| | | | | | |
| | * | | | | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: ↵PixelTomsen2012-02-243-27/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
| * | | | | | Merge branch 'master' into careminsterMelanie2012-02-2414-34/+65
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem.
| | * | | | | Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
| | | | | | |
| | * | | | | Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-248-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set ↵Justin Clark-Casey (justincc)2012-02-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | speed.
| | * | | | | llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTargetPixelTomsen2012-02-243-5/+33
| | | | | | |
| | * | | | | Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.Justin Clark-Casey (justincc)2012-02-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should resolve http://opensimulator.org/mantis/view.php?id=5901
| | * | | | | Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-233-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
* | | | | | | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-092-14/+9
| | | | | | |
* | | | | | | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-093-100/+187
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
* | | | | | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
* | | | | | changes on undo/redo (untested/incomplete). Think we may consider moving ↵UbitUmarov2012-03-073-153/+66
| |_|_|_|/ |/| | | | | | | | | | | | | | this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
* | | | | Prevent scripted region crossings from crashing with prim limits enabledMelanie2012-03-061-1/+7
| | | | |
* | | | | Null PhysActor on SOP.Copy() to prevent clobbering the original oneMelanie2012-03-061-4/+3
| | | | |
* | | | | Removed some whitespace errors - don't be naughty, don't use hard tabs!Melanie2012-03-061-11/+0
| | | | | | | | | | | | | | | | | | | | Also removed commented code block.
* | | | | make copied parts have diferent LocalIds than original. More building ↵UbitUmarov2012-03-062-5/+74
| | | | | | | | | | | | | | | | | | | | control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-063-7/+27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | | | | | | | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * | | | Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | | | | | | | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * | | | llListSort SL compatibility: When sorting strided list and the listMelanie2012-03-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | length is not a multiple of the stride, return the original list. Also, enforce that sort is ascending only when the ascending parameter is 1, and not when it is != 0
* | | | | update ubitOdeUbitUmarov2012-03-054-78/+297
| | | | |
generated by cgit v1.1 at 2024-12-18 12:59:57 +0000