OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,452 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

54 Commits (7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9)

Author SHA1 Message Date
Mandarinka Tasty 7c566dca5a The new Constant: integer OBJECT_REZZER_KEY = 32; 
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2016-12-04 17:18:56 +00:00
Melanie 3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc) 7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
Melanie a2c6094324 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc) 6235d16c31 Make "show object part" command correctly display script status. 
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
 2012-10-31 00:31:18 +00:00
Melanie d32cf21576 Add preservation of running state of scripts when drag-copying. 2012-07-01 18:30:59 +01:00
Melanie 31ab8b2fe0 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc) 01b00ad0d5 Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed. 
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
 2012-05-05 00:29:14 +01:00
Melanie 567f4c51f8 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:52:17 +00:00
Melanie dbc3f1ff92 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-02-02 01:53:13 +00:00
Melanie 45ad9e39a6 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:05:14 +01:00
Melanie dc612d0f08 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc) 0688861aa7 Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem 2011-11-25 22:15:29 +00:00
Melanie c271bbcc8a Preserve the script running flag when copying an object. 2011-01-08 16:44:28 +01:00
Diva Canto c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. 
New migration in inventory table in order to make CreatorID varchar(255).
 2010-11-21 17:19:24 -08:00
Melanie 22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Melanie 537905d81b Add a setter to OldItemID so it can be deserialized 2010-10-13 19:45:55 +01:00
Melanie 9cf8795ecf Fix a merge artefact that broke script state persistence in XAttachments 2010-09-19 22:53:05 +02:00
Justin Clark-Casey (justincc) f7b28dd321 If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well 2010-09-07 03:41:29 +01:00
Melanie 45301d8a49 Defer sending of CHANGED_OWNER to make it work on rezzed objects and 
attachments in addition to objects sold in place
 2010-05-03 01:14:38 +01:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Dr Scofield 7dbcf0570f From: Alan Webb <alan_webb@us.ibm.com> 
Changes to enable script state persistence across non-restart
serialization situations (inventory/OAR/attachments)

Also fixing test cases for OAR and IAR so they don't barf with the new code.
 2009-04-22 18:09:55 +00:00
Homer Horwitz 5200a849f6 Reverting r9224. We don't have scripts in the SL sense (with binary and state). 
Using this identifier prevents "our" scripts from working.
Reopens Mantis #3482, I'm afraid.
 2009-04-19 18:30:02 +00:00
Homer Horwitz be08c2d411 Change invType of scripts from "lsl_text" to "script". Fixes Mantis #3482. 2009-04-19 13:34:38 +00:00
Melanie Thielker 3efdccbb12 Committing the LCO database layer. Native MySQL, no ADO. New reconnect 
mechanism to prevent prim loss. Preserve link order on sim restart
and drag copy. Fix drag-copied prims' inventories. Fix persistence
of child prim inventories.
 2008-11-26 07:34:38 +00:00
Adam Frisby cf0a14bec9 * Added IClientIM to IClientCore interfaces 
* Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting.
* Removed unused usings from Framework.*
 2008-11-08 17:20:54 +00:00
Melanie Thielker 5865a2b8f8 Set a default creation date on inventory and task inventory items 2008-10-21 00:44:57 +00:00
Sean Dague 1389461854 one class per file please. 
This puts the TaskInventoryDictionary in it's own file.
 2008-10-01 18:51:09 +00:00
Teravus Ovares 7d89e12293 * This is the fabled LibOMV update with all of the libOMV types from JHurliman 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
 2008-09-06 07:52:41 +00:00
Jeff Ames 6ef9d4da90 Formatting cleanup. 2008-08-18 00:39:10 +00:00
Sean Dague cf317f5c33 refactor TaskInventoryItem Mask -> Permissions to be consistant with how things 
are stored in the db.
 2008-07-23 22:14:29 +00:00
Sean Dague aad92e1368 turn fields -> properties in TaskInventoryItem 2008-07-23 19:28:18 +00:00
Dr Scofield feb30217de dr scofield's warning safari: 
* commented out [Obsolete(....)] attributes where no replacement feature
  was available: if we want to attribute code that we think needs to be 
  reworked, we should define a new attribute and use that instead 
  (together with a little tool to retrieve all the attributed code then)
* commenting out unused variables
 2008-06-27 16:58:21 +00:00
Jeff Ames 4ec4e16c80 Formatting cleanup, minor refactoring, svn properties. 2008-06-04 09:59:27 +00:00
Dr Scofield 1fb16688d1 cleanup: uncommenting null-op else tree in TaskInventoryItem.cs 2008-06-02 08:43:05 +00:00
Justin Clarke Casey 161dfe9b68 * minor: comment out old debugging messages in task inventory item restoration routines 2008-05-31 21:21:46 +00:00
Jeff Ames 65c5efe43b Formatting cleanup. 2008-05-16 01:22:11 +00:00
Adam Frisby 375163a6fe * Spring cleaning. 
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
 2008-04-29 14:04:55 +00:00
Sean Dague 2a2ef42e64 replace hard tabs with 4 spaces to be consistant in the source. 
Please adjust your editors to not use hard tabs.
 2008-04-24 12:27:24 +00:00
Adam Frisby 163d254bb9 * Applying Mantis #1021 (llStartAnimation/llStopAnimation) - Thanks Melanie! 2008-04-23 11:53:16 +00:00
Adam Frisby bca7ab7e36 * Applying Mantis #1020 (Animations) - Thanks Melanie. 2008-04-23 11:52:25 +00:00
Adam Frisby fef3b36894 * Optimised using statements and namespace references across entire project (this took a while to run). 2008-04-21 07:09:17 +00:00
Justin Clarke Casey c5a5555d4f * Minor: log message correction 2008-04-07 16:46:49 +00:00
Justin Clarke Casey 2caea75aa8 * Okay you can put down your pitchforks - this patch should fix rezzing of items (with inventory) on Windows 
* Now properly dealing with prims which don't contain items - thanks to thomas for the patch which gave insight into this situation
* Also, an xml exception no longer crahes the client session    
* Leaving in debugging lines in case there are further problems
* Not yet tested on Linux, though I'm just about to.
 2008-04-07 16:30:29 +00:00
Justin Clarke Casey cdff09d0bb * Removing debugging goo for mantis 854 since the fix is reported to work. 2008-04-04 15:02:20 +00:00
Justin Clarke Casey b9b99ee87c * Attempted resolution for mantis 854 
* Also adds more temporary debugging goo in case the fix didn't work
 2008-04-03 17:13:45 +00:00
Justin Clarke Casey 1038c244cf * Add some temporary task inventory item inflation debug messages to investigate mantis 854 2008-04-02 15:16:32 +00:00
Jeff Ames 47180080f0 Formatting cleanup. 2008-03-18 05:16:43 +00:00
Jeff Ames a8cfbbe963 Minor cleanup. 2008-02-20 18:38:20 +00:00
Justin Clarke Casey b33da2538e * Fix mantis 345 - it is now possible to duplicate prims directly in the region again without breakage 
* This includes their inventories
* Also, this revision properly synchronizes prim inventory crud.
 2008-01-16 20:27:12 +00:00