aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-061-4/+17
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Multiattach, part 2Melanie2013-03-051-3/+9
| |
| * Multiattach, part 1Melanie2013-03-051-1/+8
| |
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'avination' into careminsterMelanie2012-12-211-0/+17
|\ \ \ | | |/ | |/|
| * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+17
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+8
|\ \ \ | |/ /
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+6
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+3
| | | | | | | | | | | | since at least for now seems good enought
* | | Merge branch 'master' into careminsterMelanie2012-12-041-0/+115
|\ \ \ | |/ / |/| / | |/ | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * Improvement in HGInstantMessageService: account for the existence of an ↵Diva Canto2012-12-041-0/+115
| | | | | | | | offline IM service.
* | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-10-311-1/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add method doc to IAssetService.Get(string, object, AssetRetrieved) ↵Justin Clark-Casey (justincc)2012-10-301-1/+5
| | | | | | | | | | | | outlining the situations in which AssetRetrieved may be called back with a null AssetBase. These situations include asset not found and remote service not responding.
* | Merge branch 'master' into careminsterMelanie2012-10-201-1/+37
|\ \ | |/
| * Add method doc for IPresenceServiceJustin Clark-Casey (justincc)2012-10-201-1/+37
| |
* | Merge branch 'master' into careminsterMelanie2012-10-121-0/+13
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+13
| |
* | Merge branch 'master' into careminsterMelanie2012-10-021-1/+1
|\ \ | |/
| * On more virtual methodDiva Canto2012-10-011-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-291-9/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-271-9/+0
| | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-0/+8
|\ \ | |/
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-251-0/+8
| |
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-151-0/+1
| | | | | | | | script needs this for proper logging.
* | Merge branch 'master' into careminsterMelanie2012-08-141-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Exclude temp attachemnts from being sent to the avatar serviceMelanie2012-08-141-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-07-011-10/+0
|\ \ | |/
| * Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-10/+0
| | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | Merge branch 'master' into careminsterMelanie2012-05-271-1/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-241-1/+11
| | | | | | | | lookup rather than the region handle.
* | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-5/+15
| | | | | | | | more lobe ?
* | Merge branch 'master' into careminsterMelanie2012-03-311-1/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-301-0/+8
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
| * refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
* | Merge branch 'master' into careminsterMelanie2012-03-221-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-211-1/+3
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
* | Merge branch 'master' into careminsterMelanie2012-03-211-0/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-0/+11
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-171-0/+2
| | | | | | | | direct user connections.
* | Merge branch 'master' into careminsterMelanie2012-02-231-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+1
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-01-301-1/+8
|\ \ | |/
| * Next step for world map overlaysMelanie2012-01-301-1/+8
| |
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-1/+2
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-1/+2
| |
generated by cgit v1.1 at 2024-12-16 12:27:20 +0000