aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-251-4/+4
|\
| * refactor: rename some AssetHelpers.CreateAsset() methods to ↵Justin Clark-Casey (justincc)2011-10-221-4/+4
| | | | | | | | CreateNotecardAsset()
* | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
| | | | | | | | Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-252-268/+268
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-192-268/+268
| | | | | | | | endings from previous commit.
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-252-328/+300
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-192-328/+300
| | | | | | | | scene presence by client ID.
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-151-1/+1
| |
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-251-4/+1
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-151-4/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+8
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent ↵Justin Clark-Casey (justincc)2011-10-111-0/+8
| | | | | | | | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene
* | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmergeMelanie2011-10-121-0/+1
|\ \ | |/
| * meaningless change to goose pandaJustin Clark-Casey (justincc)2011-10-111-0/+1
| |
* | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmergeMelanie2011-10-121-0/+3
|\ \ | |/
| * Allow monitoring of stats by region nameJustin Clark-Casey (justincc)2011-10-101-0/+3
| |
* | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmergeMelanie2011-10-1215-20/+325
|\ \ | |/
| * Add other region stats (total frame time, physics fps, etc.) currently ↵Justin Clark-Casey (justincc)2011-10-1015-20/+325
| | | | | | | | | | | | | | missing from MonitorModule Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful. This doesn't affect an of the existing monitored stats.
* | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmergeMelanie2011-10-121-15/+35
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-101-15/+35
| | | | | | | | Default is currently on since this is the historical setting
* | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmergeMelanie2011-10-121-6/+4
|\ \ | |/
| * remove unused LastAssetID from DynamicTextureUpdaerJustin Clark-Casey (justincc)2011-10-101-6/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-061-1/+1
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-061-1/+1
| | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists.
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-071-1/+1
| |/ | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path.
* | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-121-6/+6
|\ \ | |/
| * Simplified IsInTransit property on ScenePresence and removed InTransit() ↵Dan Lake2011-10-061-6/+6
| | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
* | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
| * Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
| |
* | Fix rezzing coalesced object broken by core mergeMelanie2011-10-121-54/+36
| |
* | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-122-399/+398
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-042-361/+375
| | | | | | | | handlers for attachments to call public interface and rearranged module file into sections
* | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-112-95/+73
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-032-95/+73
| | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-111-4/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-031-5/+4
| |
* | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-111-8/+5
|\ \ | |/
| * minor: remove clutter null check from pass in config to ↵Justin Clark-Casey (justincc)2011-10-011-8/+5
| | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-112-5/+54
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-302-4/+53
| | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-111-3/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
| * Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-241-3/+6
| | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
* | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmergeMelanie2011-10-111-1/+11
|\ \ | |/
| * Don't try and resolve user account for authorization if the agent has come ↵Justin Clark-Casey (justincc)2011-09-241-1/+11
| | | | | | | | | | | | | | | | | | | | in via hypergrid. If a user account isn't available, this just passes on the name given by the agent instead. I'm not sure this is particularly useful since I believe that agent names could be faked in this context - it might be no more useful than a viewer agent string. In fact, there might even be an argument that passing on this name provides a false expectation of authenticity. However, I will apply for now. Patch applied from http://opensimulator.org/mantis/view.php?id=5696 Thanks Michelle Argus.
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-114-102/+253
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-234-86/+253
| | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
generated by cgit v1.1 at 2025-01-11 20:02:40 +0000