aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-1214-118/+104
| |\ \
| | * | 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-1216-88/+114
|\ \ \ \ | | |/ / | |/| |
| * | | 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-1211-33/+46
| | | | | | | | | | | | 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.
| * | Correcting ini.example were permissionmodules uses komma instead of space as ↵Michelle Argus2012-01-121-3/+3
| |/ | | | | | | separator
| * 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-104-14/+10
|\ \ | |/
| * Remove DEBUG optionBlueWall2012-01-101-5/+0
| | | | | | | | Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
| * 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-106-21/+107
|\ \ \ | | |/ | |/| | | | | | | 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
| | |\ \ | | | |/
| | | * HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵Diva Canto2012-01-101-2/+2
| | | | | | | | | | | | | | | | (r/17672)
| | * | Add "app find <uuid-or-start-of-uuid>" command to find the appearance using ↵Justin Clark-Casey (justincc)2012-01-101-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.
| * | Teleport DebuggingBlueWall2012-01-102-2/+17
| |/ | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
| * Add some run-time debugging supportBlueWall2012-01-093-1/+12
| | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| | | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
| * TP Routing debugBlueWall2012-01-091-2/+5
| | | | | | | | Fix test to checking against bitfield instead of int
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| | | | | | | | Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18
| | | | | | | | Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| | | | | | | | Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.