aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|
* Merge branch 'master' into careminsterMelanie2012-01-0229-652/+267
|\ | | | | | | | | | | | | | | 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
| * Reduce accessibility of some J2KImage/LLImageManager properties and methods ↵Justin Clark-Casey (justincc)2012-01-022-12/+12
| | | | | | | | to reduce potential code complexity and make code reading easier.
| * Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-026-72/+97
| | | | | | | | hunting. No functional changes.
| * Fix for failed http request statusBlueWall2012-01-011-14/+17
| | | | | | | | Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
| * 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.
| * Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-305-33/+30
| | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
| * Default LocalToGrid to true. Fixes minor bug introduced yesterday where old ↵Diva Canto2011-12-301-5/+1
| | | | | | | | robust UserAccount service would result is LocalToGrid at the sim being false.
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| | | | | | | | This should make bi-directional hypergrid work.
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-297-36/+80
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
| * Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
| |
| * Deleted two obsolete files in Inventory modules.Diva Canto2011-12-292-460/+0
| |
| * Deleted unused methods from HGAssetBrokerDiva Canto2011-12-291-18/+0
| |
| * Fixed mix-up in UserAccount fields when passing UserAccounts remotely.Diva Canto2011-12-291-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-292-5/+13
| |\
| * | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵Diva Canto2011-12-293-3/+7
| | | | | | | | | | | | on get_agent_home in UAS.
* | | Merge branch 'master' into careminsterMelanie2011-12-2830-3777/+3931
|\ \ \ | | |/ | |/|
| * | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-282-5/+13
| |/ | | | | | | understood by AVN v0.3
| * Add Copy task to Prebuild.exe (vsxxxx targets)BlueWall2011-12-2525-3769/+3873
| | | | | | | | | | | | | | <Files> <Match pattern="*.cs" recurse="true"/> <Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" /> </Files>
| * HG: more / love for XmasDiva Canto2011-12-244-6/+50
| |
| * HG: one more adjustment with trailing /sDiva Canto2011-12-231-2/+8
| |
* | Fix permissions being lost and correct slam behavior, removing icompatibleMelanie2011-12-271-86/+72
| | | | | | | | code inherited from core and dead code.
* | Remove a debug spamMelanie2011-12-271-1/+0
| |
* | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-242-5/+13
| | | | | | | | understood by AVN v0.3
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-244-11/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-244-11/+6
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-238-37/+97
| | |\
| | | * remove the old region crossing handlerMic Bowman2011-12-231-10/+0
| | | |
| | * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-244-28/+83
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into careminsterMelanie2011-12-234-28/+83
| |\ \ \ | | | |/ | | |/|
| | * | Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a region that does not exist. This is particularly problematic for physical objects where the velocity continues to move them out of the region causing an infinite number of failed region crossings. The patch forces an object that fails a crossing to be non-physical and moves it back into the starting region.
| | * | fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | | | | | | | | | temponrez flag
| | * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| | | | | | | | | | | | | | | | otakup0pe
| | * | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-12-221-2/+2
| | | |
* | | | Add setter for Acceleration on physics objects.Melanie2011-12-242-0/+2
| | | |
* | | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
| | | | | | | | | | | | | | | | Now SL compatible.
* | | | Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.Melanie2011-12-241-0/+9
|/ / / | | | | | | | | | For SL compatibility only
* | | Merge branch 'master' into careminsterMelanie2011-12-225-8/+23
|\ \ \ | |/ /
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵Justin Clark-Casey (justincc)2011-12-222-3/+3
| | | | | | | | | | | | external as a property
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| | |
| * | Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-223-1/+18
| |/ | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are ↵Diva Canto2011-12-221-39/+32
| | | | | | | | passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/
| * And a typo fixMelanie2011-12-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+6
|\ \ | |/
| * Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| |
* | Merge branch 'master' into careminsterMelanie2011-12-220-0/+0
|\ \ | |/
| * Harmonizing SP with AvinationMelanie2011-12-221-41/+55
| |