aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-12-185-16/+155
|\
| * add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-135-13/+128
| | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
| * revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-8/+23
| | | | | | | | since at least for now seems good enought
| * *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-1/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-12-163-5/+47
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Fix sounds so that they play from inventory after teleport rather than only ↵Justin Clark-Casey (justincc)2012-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
| * | HGAssetMapper: Get wasn't really working. It's true that some assets are ↵Diva Canto2012-12-091-3/+35
| | | | | | | | | | | | copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids.
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-0/+10
| | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now.
* | | Merge branch 'master' into careminsterMelanie2012-12-091-70/+68
|\ \ \ | |/ /
| * | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* | | Merge branch 'master' into careminsterMelanie2012-12-076-10/+21
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-055-5/+16
| | | | | | | | | | | | overriding OpenSimTestCase.SetUp()
| * | minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | | | | | | | | | child agents in simulator scenes for now.
| * | minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
| | |
| * | Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-303-17/+78
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-271-3/+57
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-281-0/+3
| | |\ \
| | * | | Show many more primitive properties on console command "show part name/id/pos"Justin Clark-Casey (justincc)2012-11-281-3/+57
| | | | |
| * | | | Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| | |/ / | |/| | | | | | | | | | twice in the receiver's inventory.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-2721-406/+467
| |\ \ \ | | |/ /
| * | | Prevent the core Groups module from being enabled when its name doesn't ↵Diva Canto2012-11-271-0/+3
| | | | | | | | | | | | | | | | match the "default" ini choice
* | | | Merge branch 'master' into careminsterMelanie2012-11-2517-208/+293
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-249-10/+10
| | | | | | | | | | | | automatically turns off any logging enabled between tests
| * | In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)2012-11-241-20/+7
| | | | | | | | | | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance
| * | Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-245-147/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
| * | minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)2012-11-231-0/+5
| | | | | | | | | | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-11-232-3/+3
| | |
| * | Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵Justin Clark-Casey (justincc)2012-11-231-40/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically.
* | | Merge branch 'master' into careminsterMelanie2012-11-232-9/+22
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| * | minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | | | | | region restart if done from the viewer.
* | | Merge branch 'master' into careminsterMelanie2012-11-204-193/+149
|\ \ \ | |/ /
| * | If GetAgents() is called with an empty userIDs array then don't bother with ↵Justin Clark-Casey (justincc)2012-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
| * | refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| |/
* | Merge branch 'avination' into careminsterMelanie2012-11-171-11/+20
|\ \
| * | Prevent a buffer overflow in asset receivingMelanie2012-11-171-11/+20
| | |
| * | Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-172-5/+4
|\ \ \ | | |/ | |/|
| * | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| | | | | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* | | Merge branch 'master' into careminsterMelanie2012-11-151-12/+8
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Following on from 4f982596, launch map name requests on an async thread from ↵Justin Clark-Casey (justincc)2012-11-151-12/+8
| | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
* | | Merge branch 'master' into careminsterMelanie2012-11-152-5/+3
|\ \ \ | |/ /
| * | Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ↵Diva Canto2012-11-141-4/+2
| | | | | | | | | | | | service)
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-1/+1
| | | | | | | | | | | | have an AssemblyInfo file.
* | | Merge branch 'master' into careminsterMelanie2012-11-1359-84/+158
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | Deleted .addin.xml. Added AssemblyInfo.csDiva Canto2012-11-132-15/+38
| | |
| * | Last 27 modules' directives (service connectors out).Diva Canto2012-11-1327-33/+54
| | |
| * | Another 11 modules' directions moved out of .addin.xmlDiva Canto2012-11-1312-14/+22
| | |
| * | Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1321-22/+41
| | |
generated by cgit v1.1 at 2024-12-21 08:32:06 +0000