Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 4 | -14/+10 |
|\ | |||||
| * | Remove DEBUG option | BlueWall | 2012-01-10 | 1 | -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/opensim | Diva Canto | 2012-01-10 | 4 | -6/+71 |
| |\ | |||||
| | * | Add avatar names to appearance log messages | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -3/+3 |
| | | | |||||
| | * | correct very minor typo in "debug scene" help | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | HG landing points: this hopefully fixes some confusion that was making HG ↵ | Diva Canto | 2012-01-10 | 1 | -5/+6 |
| | | | | | | | | | | | | avies always land in 0,0 | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 6 | -21/+107 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-10 | 2 | -2/+52 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵ | Diva Canto | 2012-01-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | (r/17672) | ||||
| | * | | Add "app find <uuid-or-start-of-uuid>" command to find the appearance using ↵ | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -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 Debugging | BlueWall | 2012-01-10 | 2 | -2/+17 |
| |/ | | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport | ||||
| * | Add some run-time debugging support | BlueWall | 2012-01-09 | 3 | -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 TeleportFlags | BlueWall | 2012-01-09 | 2 | -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 debug | BlueWall | 2012-01-09 | 1 | -2/+5 |
| | | | | | | | | Fix test to checking against bitfield instead of int | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-09 | 1 | -1/+20 |
|\ \ | |/ | |||||
| * | Fix teleport routing for incoming HG+Owner | BlueWall | 2012-01-09 | 1 | -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 routing | BlueWall | 2012-01-09 | 1 | -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 careminster | Melanie | 2012-01-09 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix HG teleport routing | BlueWall | 2012-01-09 | 1 | -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. | ||||
| * | Fix a build break | Melanie | 2012-01-09 | 1 | -1/+1 |
| | | |||||
| * | Add the HG case to landing point checks | Melanie | 2012-01-09 | 1 | -1/+1 |
| | | |||||
* | | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -1/+10 |
|\ \ | |/ | |||||
| * | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -16/+58 |
| | | |||||
| * | Update building instructions | BlueWall | 2012-01-08 | 1 | -1/+10 |
| | | | | | | | | a good place to trigger a test on the opensimulator site | ||||
| * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-08 | 1 | -0/+17 |
| |\ | |||||
| | * | Fix teleport routing | BlueWall | 2012-01-08 | 1 | -0/+17 |
| | | | | | | | | | | | | Route non-owner avatars according to land settings | ||||
* | | | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 4 | -22/+24 |
|\ \ \ | |/ / | |||||
| * | | Fix threat level setting on osNpcPlayAnimation | Melanie | 2012-01-07 | 1 | -1/+1 |
| | | | |||||
| * | | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| |/ | |||||
| * | fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check | nebadon | 2012-01-06 | 1 | -1/+1 |
| | | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -1/+1 |
| | | |||||
| * | Add method doc to SPA.Falling and use automatic private get property | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -13/+14 |
| | | |||||
| * | Fix bug where tapping home to stop falling would stop any avatar movement ↵ | Justin Clark-Casey (justincc) | 2012-01-07 | 2 | -9/+10 |
| | | | | | | | | | | | | other than falling again. Addresses http://opensimulator.org/mantis/view.php?id=5839 | ||||
| * | Fix some syntax issues | Melanie | 2012-01-06 | 2 | -4/+4 |
| | | |||||
| * | Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well | Melanie | 2012-01-06 | 3 | -0/+56 |
| | | |||||
* | | Fix threat level setting on osNpcPlayAnimation | Melanie | 2012-01-07 | 1 | -1/+1 |
| | | |||||
* | | Don't try to save a NPCs attachment states on NPC delete | Melanie | 2012-01-07 | 1 | -0/+8 |
| | | |||||
* | | Force the group tag of NPCs to "- NPC -" unless the name is completely blank. | Melanie | 2012-01-07 | 1 | -1/+9 |
| | | |||||
* | | Make sure to prefix NPC names with "NPC:" so they can't be mistaken for users | Melanie | 2012-01-07 | 1 | -0/+6 |
| | | |||||
* | | Fix some syntax issues | Melanie | 2012-01-06 | 2 | -4/+4 |
| | | |||||
* | | Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well | Melanie | 2012-01-06 | 3 | -0/+56 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -210/+190 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-06 | 1 | -215/+191 |
| |\ | |||||
| | * | Allow RemoteAdmin to deal with all the different kinds of region id ↵ | Justin Clark-Casey (justincc) | 2012-01-06 | 1 | -215/+191 |
| | | | | | | | | | | | | | | | | | | | | | parameter that have been used in different methods. See http://opensimulator.org/mantis/view.php?id=5814 Thanks Michelle Argus! | ||||
| * | | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵ | Melanie | 2012-01-06 | 9 | -20/+94 |
| |/ | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results. | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-06 | 8 | -54/+519 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 8 | -47/+451 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs | ||||
| | * | eliminate a few tabs from OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2012-01-06 | 1 | -10/+10 |
| | | |