aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-1410-117/+269
|\ | | | | | | | | | | | | | | 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
| * Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
| * Extend scripts show command to accept a single item UUID parameter to ↵Justin Clark-Casey (justincc)2012-01-141-40/+47
| | | | | | | | | | | | display one script's status Usage is now scripts show [<script-item-uuid>]
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-144-13/+21
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-01-131-24/+40
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-131-24/+40
| | |\
| | | * Fix improper code formatting introduced in 6214e6a217cfBo Iwu2012-01-131-24/+40
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-133-49/+34
| |/ / | | | | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength).
| * | Fix llRotLookAt and llLookAt for non-physical objects. Per conversationMic Bowman2012-01-131-7/+23
| |/ | | | | | | | | with Melanie and Nebadon, SL behavior seems to be that non physical objects snap to the request rotation.
| * Update RegionReadyModuleBlueWall2012-01-133-7/+98
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-01-132-96/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-122-96/+0
| | | | | | | | Move some added fuctions out of core into the addon module to keep things clean
* | Merge branch 'master' into careminsterMelanie2012-01-136-13/+3
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-1211-137/+360
| |\
| | * Change the default osNpcCreate() to create an 'owned' npc rather than an ↵Justin Clark-Casey (justincc)2012-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'unowned' one. An owned NPC is one that only the original creator can manipulate and delete. An unowned NPC is one that anybody with access to the osNpc* methods and knowledge of the avatar id can manipulate. This is to correct an oversight I made in the original reimplementation where I mistakenly assumed that avatar IDs could be treated as private. I am not anticipating that many people were deliberately making use of unowned npcs due to their insecure nature. If you do need an unowned NPC please call the new overloaded osCreateNpc() function with the option OS_NPC_NOT_OWNED.
| | * Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string ↵Justin Clark-Casey (justincc)2012-01-133-12/+0
| | | | | | | | | | | | | | | | | | name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
| | * Add missing assert to confirm owner delete succeeded to the end of ↵Justin Clark-Casey (justincc)2012-01-121-0/+2
| | | | | | | | | | | | TestOsNpcRemoveOwned()
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+0
| | |
* | | Fix typoMelanie2012-01-121-1/+1
| | |
* | | Disable unowned NPCsMelanie2012-01-121-0/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-1211-82/+311
|\ \ \ | | |/ | |/|
| * | Add api level test for removing an owned npcJustin Clark-Casey (justincc)2012-01-121-2/+55
| | |
| * | Add ossl level test for removing an unowned npcJustin Clark-Casey (justincc)2012-01-121-0/+115
| | |
| * | Add remove test for unowned avatarsJustin Clark-Casey (justincc)2012-01-121-0/+20
| | |
| * | Add osNpcCreate(string firstname, string lastname, LSL_Vector position, ↵Justin Clark-Casey (justincc)2012-01-124-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string notecard, int options) variant. This will be documented soon. Options can currently be OS_NPC_CREATE_OWNED - creates a 'creator owned' avatar that will only respond to osNpc* functions made by scripts owned by the npc creator OS_NPC_NOT_OWNED - creates an avatar which will respond to any osNpc* functions that a caller has permission to make (through the usual OSSL permission mechanisms). options is being added to provide better scope for future extensibility without having to add more functions The original non-options osNpcCreate() function will continue to exist.
| * | Allow all NPCs to show up on sensors as all osNpc* script methods now check ↵Justin Clark-Casey (justincc)2012-01-121-6/+9
| | | | | | | | | | | | | | | | | | for ownership permission before executing. As per #opensim-dev irc discussion.
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-123-25/+52
| | | | | | | | | | | | 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.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-1210-109/+95
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-122-34/+3
| | | |
| * | | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-123-18/+45
| | | | | | | | | | | | | | | | methods and expose on interface for external calls.
* | | | Merge branch 'master' into careminsterMelanie2012-01-1212-79/+105
|\ \ \ \ | | |/ / | |/| |
| * | | Allow update of stored entries within User Management Module-this is needed ↵Bo Iwu2012-01-121-48/+52
| | |/ | |/| | | | | | | | | | | | | for proper work of HG friends. See http://opensimulator.org/mantis/view.php?id=5847
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-128-27/+40
| |/ | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-112-2/+5
| | | | | | | | rather than halting the IAR load with an exception.
| * Add a check to see if an asset exists before recreating it whileMic Bowman2012-01-101-0/+6
| | | | | | | | | | | | loading an archive. This does add an extra roundtrip to the asset server if loading new assets but it protects against overwriting (and potentially corrupting) existing assets.
| * minor: Fix wrong column length in image queues reportJustin Clark-Casey (justincc)2012-01-101-2/+2
| |
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
| |
* | Adapt a cast to using the new TeleportFlagsMelanie2012-01-111-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-103-24/+104
|\ \ | |/
| * 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-103-6/+107
| | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-103-9/+10
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-104-6/+71
| |\
| | * Add avatar names to appearance log messagesJustin Clark-Casey (justincc)2012-01-101-3/+3
| | |
| | * correct very minor typo in "debug scene" helpJustin Clark-Casey (justincc)2012-01-101-1/+1
| | |
| * | HG landing points: this hopefully fixes some confusion that was making HG ↵Diva Canto2012-01-101-5/+6
| | | | | | | | | | | | avies always land in 0,0
* | | Merge branch 'master' into careminsterMelanie2012-01-105-21/+101
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-102-2/+52
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-101-2/+2
| | |\ \ | | | |/