aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-3026-253/+498
|\ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Groups V2: charge for group creation only after the group has been ↵Diva Canto2013-06-301-1/+4
| | | | | | | | successfully created
| * Revert "More debug mantis #6625"Diva Canto2013-06-301-1/+0
| | | | | | | | This reverts commit 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1.
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| | | | | | | | | | | | | | This reverts commit 8fa5d12fcb73ffcc7144009e0147febcfa3ce704. Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Revert "A little more debug for the Unknown User problem mantis #6625"Diva Canto2013-06-301-3/+0
| | | | | | | | This reverts commit ff47cf77ab52d42195fb0f089599618511d4919b.
| * Same fix to LocalInventoryServiceConnector.csDiva Canto2013-06-301-1/+2
| |
| * More on mantis #6625Diva Canto2013-06-291-1/+2
| |
| * More debug mantis #6625Diva Canto2013-06-291-0/+1
| |
| * Fixed previous debug messageDiva Canto2013-06-291-1/+1
| |
| * One more debug mantis #6625Diva Canto2013-06-291-0/+1
| |
| * More debug for mantis #6625. It looks like the home friends list is being ↵Diva Canto2013-06-291-20/+21
| | | | | | | | fetched on HG TPs.
| * A little more debug for the Unknown User problem mantis #6625Diva Canto2013-06-291-0/+3
| |
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-292-2/+10
| |
| * Remove hack to migrate previous experimental-level os materials data.Justin Clark-Casey (justincc)2013-06-291-9/+0
| | | | | | | | This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
| * Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-281-30/+42
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-06-286-107/+179
| | |\
| | * | add some locking to materials storage dictionarydahlia2013-06-281-30/+42
| | | |
| * | | Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.Justin Clark-Casey (justincc)2013-06-283-3/+14
| | |/ | |/| | | | | | | | | | | | | | | | This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer. Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000. Thanks also to Ai Austin for helping this process along. See http://opensimulator.org/mantis/view.php?id=6691 for more details.
| * | Remove "Asset deletion not supported by database" message from "delete ↵Justin Clark-Casey (justincc)2013-06-281-7/+5
| | | | | | | | | | | | | | | | | | asset" robust/standalone console command since it actually was implemented and performed. Improve other associated messages.
| * | In XAssetService, on a delete asset request also delete the asset in any ↵Justin Clark-Casey (justincc)2013-06-282-3/+6
| | | | | | | | | | | | | | | | | | chained service. This eliminates the async migration since it causes a race condition with the "delete asset" console command
| * | Reinsert code for gathering uuids reference by materials back directly into ↵Justin Clark-Casey (justincc)2013-06-283-97/+168
| |/ | | | | | | | | | | | | UuidGatherer for now. This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes. There needs to be some way for modules to register for events which are not connected with a particular scene.
| * add method docs for DAMap.GetStore() and DAMap.SetStore()dahlia2013-06-271-0/+12
| |
| * and yet another check for null returned from DynAttrs.GetStore()dahlia2013-06-271-0/+4
| |
| * test for null return from DynAttrs.GetStore()dahlia2013-06-271-0/+3
| |
| * refactor: Move code for gathering textures referenced by materials into ↵Justin Clark-Casey (justincc)2013-06-273-69/+103
| | | | | | | | | | | | MaterialsDemoModule from UuidGatherer This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-2711-172/+257
| | | | | | | | | | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
| * Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to ↵Justin Clark-Casey (justincc)2013-06-251-1/+1
| | | | | | | | | | | | | | see if Diva's recent HG updates (post 6c7e33f) fix this issue. This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID. This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
| * Improve situation where editing just the root prim of an attachment causes ↵Justin Clark-Casey (justincc)2013-06-251-1/+10
| | | | | | | | | | | | | | other prims to be set to very far off positions on reattach. Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334 However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
| * Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ↵Justin Clark-Casey (justincc)2013-06-251-10/+4
| | | | | | | | structs
* | Merge branch 'master' into careminsterMelanie2013-06-2335-950/+954
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-2338-957/+963
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-221-29/+35
| | |\
| | | * BulletSim: move new linear deflection code to own routine.Robert Adams2013-06-211-29/+35
| | | | | | | | | | | | | | | | | | | | Remove VehicleForwardVelocity changed storage since the value will be modified as movement is processed.
| | * | Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-223-7/+6
| | | | | | | | | | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| | * | HG: avoid call on localhost between sim and UAS for standalone.Diva Canto2013-06-221-1/+20
| | | |
| | * | Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-2111-365/+171
| | |/
| | * BulletSim: Implementation of Linear Deflection, it is a partial help for the ↵Vegaslon2013-06-201-5/+33
| | | | | | | | | | | | | | | | | | vehicle tuning diffrence between Opensim and Second life. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| | * BulletSim: rework velocity updating when not colliding and not flyingRobert Adams2013-06-202-5/+42
| | | | | | | | | | | | | | | | | | | | | to prevent infinite jumps. Now jumps last only AvatarJumpFrames long (default 4) which is about as high as in SL. TODO: jumping should only depend on standing (collision with feet) rather than collision anywhere on the avatar.
| | * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| | |
| | * Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. ↵Justin Clark-Casey (justincc)2013-06-201-3/+3
| | | | | | | | | | | | | | | | | | Also round this and ProcessMemory to three decimal places in common with other memory stats. I believe leaving out such minor info makes stats easier to read
| | * Allow more than one stat category to be specified in "show stats"Justin Clark-Casey (justincc)2013-06-201-30/+34
| | | | | | | | | | | | e.g. "show stats httpserver.9000 server.network"
| | * minor: Change "memory churn" terminology in statistics to "heap allocation ↵Justin Clark-Casey (justincc)2013-06-203-14/+14
| | | | | | | | | | | | rate" since this is more generally meaningful
| | * Fix minor bug where the check whether to display SmartThreadPool stats was ↵Justin Clark-Casey (justincc)2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | accidentally != null rather than == FireAndForgetMethod.SmartThreadPool Due to another check this had no practical effect
| | * minor: fix mono compiler warning in FetchInventory2HandlerJustin Clark-Casey (justincc)2013-06-201-2/+2
| | |
| | * Make it possible to specify display of stats in a particular 'container' by ↵Justin Clark-Casey (justincc)2013-06-202-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | separating category and container with a period. e.g. "show stats server.network" I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated). However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc. This commit also prevents any stat from having a period in its short name.
| | * Display existing statistic of how many http requests a server is making as ↵Justin Clark-Casey (justincc)2013-06-193-5/+23
| | | | | | | | | | | | server.network.HTTPRequestsMade in "show stats all"
| | * Mantis 6608: Math error in parcel dimensions/borders seen with land show commandTalun2013-06-191-10/+10
| | | | | | | | | | | | | | | | | | | | | This patch changes the land show console command to return numbers in the range 4 to 256 for the "to" coordinates instead of 0 to 252 Also trailing spaces removed from some lines.
| | * minor: remove mono compiler warning in OfflineIMServiceJustin Clark-Casey (justincc)2013-06-181-1/+1
| | |
| | * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
| | |
generated by cgit v1.1 at 2024-11-05 13:37:59 +0000