aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Correct an odd merge anomalyTom Grimshaw2010-05-101-1/+1
|
* Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-05-104-98/+91
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-0/+2
| |\
| | * * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-091-0/+2
| | | | | | | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-093-98/+89
| |\ \ | | |/
| | * More cleaning on presence. Friends online/offline works again.Diva Canto2010-05-083-98/+89
| | |
| | * Strip estate message sending out from the estate management module andMelanie Thielker2010-05-041-8/+0
| | | | | | | | | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module.
* | | Greatly improve login time for users with large friends lists by requesting ↵Tom Grimshaw2010-05-101-6/+39
|/ / | | | | | | all unknown UUID's in one go rather than individually
* | Strip estate message sending out from the estate management module andMelanie Thielker2010-05-041-8/+0
| | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module.
* | Adapt CM to the new CHANGED_OWNER handlingMelanie Thielker2010-05-031-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-301-2/+5
|\ \ | |/
| * * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-301-2/+5
| | | | | | | | * Removed a few buglets and added better exception handling.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-291-1/+1
|\ \ | |/
| * Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| |
| * Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-191-1/+1
| |
* | Plumb a data path to initialize an attachment from an alternate sourceMelanie Thielker2010-04-241-2/+18
| |
* | Add an additional serialization call do the detach procedure. This call isMelanie Thielker2010-04-231-0/+3
| | | | | | | | | | executed only for it's side effects, which are to block until attach(NULL_KEY) completes, before commencing detachment.
* | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-231-1/+2
| | | | | | | | state issue
* | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-191-1/+1
| |
* | Remove the event trigger for the attach event from the attachment module.Melanie Thielker2010-04-191-1/+1
| | | | | | | | The script engine already triggers this internally.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-192-12/+58
|\ \ | |/
| * All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-1/+2
| | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable.
| * refactor: move DeatchObject() into the AttachmentsModuleJustin Clark-Casey (justincc)2010-04-171-0/+10
| |
| * refactor: crudely move DetachSingleAttachmentToGround() over to the ↵Justin Clark-Casey (justincc)2010-04-161-0/+32
| | | | | | | | AttachmentsModule
| * refactor: crudely move the RezMultipleAttachments() method into the ↵Justin Clark-Casey (justincc)2010-04-161-0/+12
| | | | | | | | AttachmentsModule
| * * Adds IAssetService.GetCached() to allow asset fetching from the local ↵John Hurliman2010-04-081-0/+220
| | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership()
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-0/+229
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-131-0/+229
| |\ \
| | * | Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-081-2/+11
| | | |
| | * | Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-081-0/+220
| | | |
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-062-10/+70
| |\ \ \ | | |/ /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-304-7/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | May fix mantis #4613Diva Canto2010-03-271-1/+2
| | | |
| * | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵Dan Lake2010-03-193-6/+6
| | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-183-65/+46
|\ \ \ \ | |/ / /
| * | | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵Dan Lake2010-03-172-63/+44
| | | | | | | | | | | | | | | | | | | | | | | | eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class. This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-151-0/+75
| |\ \ \
| * | | | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵John Hurliman2010-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-153-9/+114
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵Justin Clark-Casey (justincc)2010-03-121-1/+30
| | | | | | | | | | | | | | | | | | | | AttachmentsModule
| * | | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵Justin Clark-Casey (justincc)2010-03-121-0/+46
| |/ / / | | | | | | | | | | | | AttachmentsModule
| * | | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModuleJustin Clark-Casey (justincc)2010-03-121-1/+31
| | | |
| * | | Formatting cleanup. Add copyright notices.Jeff Ames2010-03-103-7/+7
| | | |
| * | | Changed a cryptic debug message and a wrong commentDiva Canto2010-03-091-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-091-1/+25
|\ \ \ \ | |/ / /
| * | | - supporting llTextBoxunknown2010-03-061-1/+25
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-061-0/+257
|\ \ \ \ | |/ / /
| * | | refactor: Move DetachSingleAttachmentToInv to region moduleJustin Clark-Casey (justincc)2010-03-061-15/+56
| | | | | | | | | | | | | | | | need to rationalize method names later
| * | | refactor: move another AttachObject methodJustin Clark-Casey (justincc)2010-03-051-1/+46
| | | |
| * | | refactor: move user inventory side of RezSingleAttachment to moduleJustin Clark-Casey (justincc)2010-03-051-0/+30
| | | |