aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-161-1/+1
|\
| * Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | | | adjustment commit. Left in the method doc.
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Fix mergeMelanie2012-01-141-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-141-34/+30
|\ \ | |/ | | | | | | | | | | | | 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
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-132-45/+30
| | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength).
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-6/+6
| | | | | | | | 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-111-1/+1
| | | | | | | | rather than halting the IAR load with an exception.
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | 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-102-19/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/ | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| | | | | | | | | | | | 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.
| * Fix a build breakMelanie2012-01-091-1/+1
| |
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| |
| * Update teleport routing to match AvinationMelanie2012-01-081-16/+58
| |
| * Fix teleport routingBlueWall2012-01-081-0/+17
| | | | | | | | Route non-owner avatars according to land settings
* | Update teleport routing to match AvinationMelanie2012-01-081-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-072-20/+22
|\ \ | |/
| * Add method doc to SPA.Falling and use automatic private get propertyJustin Clark-Casey (justincc)2012-01-071-13/+14
| |
| * Fix bug where tapping home to stop falling would stop any avatar movement ↵Justin Clark-Casey (justincc)2012-01-072-9/+10
| | | | | | | | | | | | other than falling again. Addresses http://opensimulator.org/mantis/view.php?id=5839
| * If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-16/+39
| | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof.
* | If dragging a script that is no copy from prim inventory into agentMelanie2012-01-061-5/+24
| | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof.
* | That needs to be callable from elsewhere!Melanie2012-01-051-1/+1
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-054-5/+30
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-055-12/+33
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-054-5/+30
| | |\
| | | * Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-035-177/+209
| | | |\
| | | | * commented out "Prevented flyoff" log message for now as this becomes ↵Justin Clark-Casey (justincc)2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed.
| | | * | Access to these static methods to serialize objects are useful outside of ↵Dan Lake2012-01-031-4/+4
| | | | | | | | | | | | | | | | | | | | serializer
| | * | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| | | |/ | | |/|
* | | | Clean up GetWorldPositionMelanie2012-01-051-7/+3
| | | |
* | | | Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|/ / /
* | | Merge branch 'master' into careminsterMelanie2012-01-021-13/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * | Bug fix in map tiles in standalone: the map has been blank since commit ↵Diva Canto2011-12-301-13/+20
| | | | | | | | | | | | | | | | | | 01ae916bad672722aa62ee712b7b580d6f5f4370 r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4901167779f07ed3e89fb1d24ffc22a Author: Oren Hurvitz Date: 7/22/2011 This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-241-1/+1
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2011-12-231-1/+1
| |\ \ \ | | |/ /
| | * | fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | | | | | | | | | temponrez flag
* | | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
|/ / / | | | | | | | | | Now SL compatible.
generated by cgit v1.1 at 2024-12-30 01:51:33 +0000