Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 1 | -1/+6 |
|\ | |||||
| * | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+6 |
| |\ | |||||
| | * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones. | ||||
* | | | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 |
|\ \ \ | |/ / |/| | | |||||
| * | | Change the asset connector to allow connection to different asset servers | Melanie | 2011-10-06 | 1 | -7/+61 |
| | | | | | | | | | | | | depending on the first two digits of the asset id. | ||||
* | | | Bring us up to date. | Tom | 2011-09-14 | 1 | -12/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | Increase information in logging for UserAgentServiceConnector. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -12/+12 |
| | | | | | | | | | | | | Done for http://opensimulator.org/mantis/view.php?id=5669 | ||||
* | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 6 | -48/+88 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | comment out some of the currently less useful debug log messages | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -1/+1 |
| | | |||||
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 2 | -3/+3 |
| | | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned. | ||||
| * | When an uncached asset is requested multiple times concurrently, only load ↵ | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com> | ||||
| * | add test for resizing one part in a group | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+0 |
| | | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -35/+36 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-20 | 1 | -41/+40 |
|\ \ | |/ | |||||
| * | V2 map now working in grids too. WARNING: A few visible configuration ↵ | Diva Canto | 2011-06-13 | 1 | -41/+40 |
| | | | | | | | | variables added in order for this to work. See .ini.example changes | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 2 | -1/+159 |
|\ \ | |/ | |||||
| * | First pass at making the V2 map work. Standalones only for now. There are ↵ | Diva Canto | 2011-06-12 | 1 | -0/+158 |
| | | | | | | | | some issues with the zoom level -- TBD. | ||||
| * | Only send AgentOnline to the client if the friendsOnline list has elements. ↵ | Diva Canto | 2011-06-11 | 1 | -1/+1 |
| | | | | | | | | Also, increased the timeout on UserAgentServiceConnector, StatusNotification again. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -12/+23 |
|\ \ | |/ | |||||
| * | More tweaking on the UserAgentServiceConnector: add constructor that does ↵ | Diva Canto | 2011-06-10 | 1 | -13/+22 |
| | | | | | | | | not do DNS lookup, and use that for friends notification. | ||||
| * | Decreased timeout of HG StatusNotification to 4secs. ↵ | Diva Canto | 2011-06-10 | 1 | -1/+1 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5516 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 6 | -18/+747 |
|\ \ | |/ | |||||
| * | This hopefully fixes all issues with online/offline notifications across ↵ | Diva Canto | 2011-06-07 | 1 | -2/+53 |
| | | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528 | ||||
| * | HG IM: increase the timeout value | Diva Canto | 2011-06-02 | 1 | -1/+1 |
| | | |||||
| * | HG Friends bug fix: connector was shrinking principalID to UUID. | Diva Canto | 2011-06-02 | 1 | -12/+12 |
| | | |||||
| * | Fixed an issue with the response of CreateAgent over the SimulationConnector. | Diva Canto | 2011-05-28 | 1 | -6/+21 |
| | | |||||
| * | HG lures working! Friends can offer friends HG teleports via the profile. ↵ | Diva Canto | 2011-05-27 | 1 | -0/+1 |
| | | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example | ||||
| * | Commented a few extra debug messages. | Diva Canto | 2011-05-26 | 2 | -4/+2 |
| | | |||||
| * | HG IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 2 | -0/+62 |
| | | | | | | | | looked back in source user's User Agent service. | ||||
| * | HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵ | Diva Canto | 2011-05-25 | 2 | -0/+187 |
| | | | | | | | | testing. | ||||
| * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -1/+65 |
| | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | HG friends: Status notifications working. Also initial logins get the online ↵ | Diva Canto | 2011-05-23 | 1 | -0/+91 |
| | | | | | | | | friends in other grids. | ||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 3 | -1/+71 |
| | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. | ||||
| * | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 3 | -32/+40 |
| | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. | ||||
| * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 3 | -4/+186 |
| | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
| * | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
| * | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| | | |||||
* | | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
* | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| | | |||||
* | | Attempt to make teleports more reliable. This may break redirection on login | Melanie | 2011-05-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 2 | -17/+20 |
|\ \ | |/ | |||||
| * | Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵ | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | | | | | | | avatar takes 6secs to transfer between sims on the same machine... | ||||
| * | Oops, forgot this one. | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | |||||
| * | Turns out that it's a bad idea to let Agent position updates linger for a ↵ | Diva Canto | 2011-05-02 | 1 | -7/+7 |
| | | | | | | | | long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before. | ||||
| * | Fixed confusing OSDMap that comes as the response of QueryAccess in the case ↵ | Diva Canto | 2011-05-01 | 1 | -9/+12 |
| | | | | | | | | it fails. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -7/+12 |
|\ \ | |/ | |||||
| * | Minor improvement in version checking (Simulation service) | Diva Canto | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 1 | -7/+12 |
| | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -6/+4 |
|\ \ | |/ | |||||
| * | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. | Diva Canto | 2011-04-25 | 1 | -6/+4 |
| | |