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

17105 Commits (2c03b6f0aef3e4d437a106abacc7f3cf5620318e)

Author SHA1 Message Date
Melanie 67e7f25d6c Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge 2011-10-11 22:32:21 +01:00
Melanie 6101de2316 Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:32:10 +01:00
Melanie 9935eb6578 Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge 2011-10-11 22:26:18 +01:00
Melanie a4ba99f020 Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge 2011-10-11 22:25:03 +01:00
Melanie 6e6c70be15 Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge 2011-10-11 22:24:40 +01:00
Melanie 1ba53850b2 Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge 2011-10-11 22:23:40 +01:00
Melanie 34954172a1 Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge 2011-10-11 22:23:16 +01:00
Melanie 36ec9f0e94 Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge 2011-10-11 22:22:49 +01:00
Melanie b9de3b7f5b Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge 
Conflicts:
	OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
	OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
	prebuild.xml
 2011-10-11 22:22:34 +01:00
Melanie 071c3fe721 Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge 2011-10-11 22:15:44 +01:00
Melanie 03d533dc1e Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge 2011-10-11 22:15:25 +01:00
Melanie 45ce8db5db Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge 2011-10-11 22:14:17 +01:00
Melanie 341efb0942 Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge 2011-10-11 22:12:25 +01:00
Melanie 68a42af30f Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge 2011-10-11 22:11:55 +01:00
Melanie 6978ae0a59 Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:11:44 +01:00
Melanie 117d24be54 Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge 2011-10-11 21:45:01 +01:00
Melanie 634fbca6bb Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge 2011-10-11 21:41:46 +01:00
Melanie a8747b3888 Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge 2011-10-11 21:41:30 +01:00
Melanie 189f766b8b Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmerge 2011-10-11 21:32:49 +01:00
Melanie f1fa059b37 Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge 2011-10-11 21:32:24 +01:00
Melanie 3ac15c03b2 Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge 2011-10-11 21:32:14 +01:00
Melanie 0fa21b7b5e Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge 2011-10-11 21:31:48 +01:00
Melanie 673886d231 Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge 2011-10-11 21:30:42 +01:00
Melanie 986a3838a6 Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge 2011-10-11 21:29:58 +01:00
Melanie 288f5bd727 Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge 2011-10-11 21:29:38 +01:00
Melanie 5b40389352 Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge 2011-10-11 21:29:04 +01:00
Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
 2011-10-11 21:28:23 +01:00
Melanie 9d22110c23 Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge 2011-10-11 21:22:58 +01:00
Melanie cc1fe354d0 Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 21:21:44 +01:00
Melanie 859a804d59 Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 21:10:55 +01:00
Melanie c95c8ab246 Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 21:06:06 +01:00
Melanie 7d2a3dc174 Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 20:57:31 +01:00
Melanie 9500415c61 Merge branch 'careminster-presence-refactor' into bigmerge 2011-10-06 17:57:28 +02:00
Melanie 300d357573 Fix physics proxy position when linking and rotating the root prim only 2011-10-06 17:55:20 +02:00
Melanie 363a99593d Change the asset connector to allow connection to different asset servers 
depending on the first two digits of the asset id.
 2011-10-06 15:39:21 +02:00
Dan Lake 38d205502a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-04 16:59:35 -07:00
Dan Lake 146322eb34 Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again. 2011-10-04 16:59:05 -07:00
Justin Clark-Casey (justincc) 9a49b3b519 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-04 23:53:30 +01:00
Justin Clark-Casey (justincc) b907a66f39 When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one. 
This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
 2011-10-04 23:48:35 +01:00
Mic Bowman 413e299045 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-04 15:44:22 -07:00
Mic Bowman b229a72a5f Turn off keepalives when commands are specified 2011-10-04 15:43:41 -07:00
Justin Clark-Casey (justincc) 8a216dc1cc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-04 22:49:06 +01:00
Justin Clark-Casey (justincc) f1986d54bb Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. 2011-10-04 22:48:28 +01:00
Dan Lake 92c88121c7 Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections 2011-10-04 14:40:39 -07:00
Dan Lake bfa405e6f7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-03 16:45:04 -07:00
Dan Lake 460946ad62 Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still. 2011-10-03 16:44:32 -07:00
Justin Clark-Casey (justincc) c7d0d71666 trival tweak to trigger the continuous integration system 2011-10-04 00:37:02 +01:00
Pixel Tomsen b98442dcec Animation-States Turning Left, Turning Right implemented/enabled 
http://opensimulator.org/mantis/view.php?id=3036
 2011-10-04 00:27:11 +01:00
Justin Clark-Casey (justincc) a8af0a5ba8 Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather than "" 
As per http://wiki.secondlife.com/wiki/LlGetTexture
 2011-10-04 00:15:48 +01:00
Justin Clark-Casey (justincc) 8a6e6866d9 For llGetTexture(), if the face texture asset is in the inventory, return the inventory name rather than the asset UUID 
This is as per http://wiki.secondlife.com/wiki/LlGetTexture
Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early.
Thanks Michelle Argus!
 2011-10-04 00:07:52 +01:00